From 873becec09d75a3dedc17f6675f8c54099c1c0e9 Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Sat, 9 Jun 2018 12:44:01 -0700 Subject: [PATCH] Add tmpview attribute for docker virtual switch and skip swss warm restart test if temp view enabled. Signed-off-by: Jipan Yang --- tests/conftest.py | 1 + tests/test_warm_reboot.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index 073ee29d4d2..3b52a2fdf1d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -118,6 +118,7 @@ def __init__(self, name=None, useTempView=True): os.system("mkdir -p /var/run/redis-vs/noUseTempView") else: os.system("rm -f -r /var/run/redis-vs/noUseTempView") + self.tmpview = useTempView if name != None: # get virtual switch container diff --git a/tests/test_warm_reboot.py b/tests/test_warm_reboot.py index b53e1b18d77..8dc27ef876a 100644 --- a/tests/test_warm_reboot.py +++ b/tests/test_warm_reboot.py @@ -6,6 +6,10 @@ def test_swss_warm_restore(dvs): + # syncd warm start with temp view not supported yet + if dvs.tmpview == True: + return + dvs.runcmd("/usr/bin/stop_swss.sh") time.sleep(3) dvs.runcmd("mv /var/log/swss/sairedis.rec /var/log/swss/sairedis.rec.b")