From 4c972716163e5b332a375a0d9f44473dd14de8e1 Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Wed, 22 Aug 2018 00:47:09 -0700 Subject: [PATCH] [VS] update dvs.runcmd() return value check (#588) Signed-off-by: Jipan Yang --- tests/test_warm_reboot.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/tests/test_warm_reboot.py b/tests/test_warm_reboot.py index 1a195cd62d05..50057646bd13 100644 --- a/tests/test_warm_reboot.py +++ b/tests/test_warm_reboot.py @@ -86,6 +86,14 @@ def how_many_entries_exist(db, table): tbl = swsscommon.Table(db, table) return len(tbl.getKeys()) +# No create/set/remove operations should be passed down to syncd for vlanmgr/portsyncd warm restart +def checkCleanSaiRedisCSR(dvs): + (exitcode, num) = dvs.runcmd(['sh', '-c', 'grep \|c\| /var/log/swss/sairedis.rec | wc -l']) + assert num == '0\n' + (exitcode, num) = dvs.runcmd(['sh', '-c', 'grep \|s\| /var/log/swss/sairedis.rec | wc -l']) + assert num == '0\n' + (exitcode, num) = dvs.runcmd(['sh', '-c', 'grep \|r\| /var/log/swss/sairedis.rec | wc -l']) + assert num == '0\n' def test_PortSyncdWarmRestart(dvs): @@ -145,13 +153,7 @@ def test_PortSyncdWarmRestart(dvs): dvs.runcmd(['sh', '-c', 'supervisorctl start portsyncd']) time.sleep(2) - # No create/set/remove operations should be passed down to syncd for portsyncd warm restart - num = dvs.runcmd(['sh', '-c', 'grep \|c\| /var/log/swss/sairedis.rec | wc -l']) - assert num == '0\n' - num = dvs.runcmd(['sh', '-c', 'grep \|s\| /var/log/swss/sairedis.rec | wc -l']) - assert num == '0\n' - num = dvs.runcmd(['sh', '-c', 'grep \|r\| /var/log/swss/sairedis.rec | wc -l']) - assert num == '0\n' + checkCleanSaiRedisCSR(dvs) #new ip on server 5 dvs.servers[5].runcmd("ifconfig eth0 11.0.0.11/29") @@ -270,13 +272,7 @@ def test_VlanMgrdWarmRestart(dvs): (exitcode, bv_after) = dvs.runcmd("bridge vlan") assert bv_after == bv_before - # No create/set/remove operations should be passed down to syncd for vlanmgr warm restart - (exitcode, num) = dvs.runcmd(['sh', '-c', 'grep \|c\| /var/log/swss/sairedis.rec | wc -l']) - assert num == '0\n' - (exitcode, num) = dvs.runcmd(['sh', '-c', 'grep \|s\| /var/log/swss/sairedis.rec | wc -l']) - assert num == '0\n' - (exitcode, num) = dvs.runcmd(['sh', '-c', 'grep \|r\| /var/log/swss/sairedis.rec | wc -l']) - assert num == '0\n' + checkCleanSaiRedisCSR(dvs) #new ip on server 5 dvs.servers[5].runcmd("ifconfig eth0 11.0.0.11/29")