Add tmpview member variable for docker virtual switch and skip swss w…

…arm restart test if temp view enabled. Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
jipanyang · Jun 9, 2018 · 348e518 · 348e518
1 parent da09da2
commit 348e518
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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")