From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 18 Dec 2012 22:33:42 +0000 (+0100)
Subject: check-vsys-defaults seems to have the right logic but somehow this will
X-Git-Tag: tests-5.1-9~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e44516c44ae3e37be6f0689a2113c00cea1f1763;p=tests.git

check-vsys-defaults seems to have the right logic but somehow this will
fail when the slice is created by the test framework so get this out
of the way for now
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 1352477..ee16f19 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -94,7 +94,7 @@ class TestPlc:
         'sfi_list@1', 'sfi_show@1', 'sfi_slices@1', 'sfa_utest@1', SEPSFA,
         # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot
         # but as the stress test might take a while, we sometimes missed the debug mode..
-        'check_vsys_defaults', 'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
+        'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
         'ssh_node_boot@1', 'ssh_slice', 'check_initscripts', SEP,
         'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
         'cross_check_tcp@1', 'check_system_slice', SEP,
diff --git a/system/TestSlice.py b/system/TestSlice.py
index 8cb3aab..eef5ee8 100644
--- a/system/TestSlice.py
+++ b/system/TestSlice.py
@@ -68,7 +68,12 @@ class TestSlice:
         vsys_tags = self.test_plc.apiserver.GetSliceTags (auth,{'tagname':'vsys','name':slice_name})
         values=[ st['value'] for st in vsys_tags ]
         expected=self.test_plc.plc_spec['expected_vsys_tags']
-        return set(values) == set(expected)
+        result = set(values) == set(expected)
+        if not result:
+            print 'Check vsys defaults with slice %s'%slice_name
+            print 'Expected %s'%expected
+            print 'Got %s'%values
+        return result
 
     # just add the nodes and handle tags
     def add_nodes (self):