Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkill -9 zebra for frr warm restart VS test fix #927

Merged
merged 1 commit into from
Jun 9, 2019
Merged

pkill -9 zebra for frr warm restart VS test fix #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def start_zebra(dvs):
time.sleep(5)

def stop_zebra(dvs):
dvs.runcmd(['sh', '-c', 'pkill -x zebra'])
dvs.runcmd(['sh', '-c', 'pkill -9 zebra'])
time.sleep(1)

def start_fpmsyncd(dvs):
Expand Down
3 changes: 1 addition & 2 deletions tests/test_warm_reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,6 @@ def set_restart_timer(dvs, db, app_name, value):
################################################################################


@pytest.mark.skip(reason="Failing. Under investigation")
def test_routing_WarmRestart(dvs, testlog):

appl_db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
Expand Down Expand Up @@ -1014,7 +1013,7 @@ def test_routing_WarmRestart(dvs, testlog):
#
dvs.runcmd("ip route add 192.168.1.100/32 nexthop via 111.0.0.2")
dvs.runcmd("ip route add 192.168.1.200/32 nexthop via 122.0.0.2")
dvs.runcmd("ip route add 192.168.1.300/32 nexthop via 133.0.0.2")
dvs.runcmd("ip route add 192.168.1.230/32 nexthop via 133.0.0.2")

#
# Defining baseline IPv4 ecmp route-entries
Expand Down