gitignore

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 1dcc585..57b0c5a 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -71,7 +71,6 @@ def slice_mapper (method):
 class slice_mapper__tasks (object):
     # could not get this to work with named arguments
     def __init__ (self,timeout_minutes,silent_minutes,period_seconds):
-        print "self",self
         print "timeout_minutes,silent_minutes,period_seconds",timeout_minutes,silent_minutes,period_seconds
         self.timeout=timedelta(minutes=timeout_minutes)
         self.silent=timedelta(minutes=silent_minutes)
@@ -135,7 +134,10 @@ class TestPlc:
         'ssh_node_boot@1', 'node_bmlogs@1', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts', SEP,
         'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
         'cross_check_tcp@1', 'check_system_slice', SEP,
-        'empty_slices', 'ssh_slice_off', 'fill_slices', SEP,
+        # check slices are turned off properly
+        'empty_slices', 'ssh_slice_off', SEP,
+        # check they are properly re-created with the same name
+        'fill_slices', 'ssh_slice', SEP,
         'force_gather_logs', SEP,
         ]
     other_steps = [ 
@@ -618,15 +620,15 @@ class TestPlc:
         repo_url = self.options.arch_rpms_url
         for level in [ 'arch' ]:
            repo_url = os.path.dirname(repo_url)
-        # pass the vbuild-nightly options to vtest-init-vserver
+        # pass the vbuild-nightly options to [lv]test-initvm
         test_env_options=""
         test_env_options += " -p %s"%self.options.personality
         test_env_options += " -d %s"%self.options.pldistro
         test_env_options += " -f %s"%self.options.fcdistro
         if self.options.plcs_use_lxc:
-            script="vtest-init-lxc.sh"
+            script="ltest-initvm.sh"
         else:
-            script="vtest-init-vserver.sh"
+            script="vtest-initvm.sh"
         vserver_name = self.vservername
         vserver_options="--netdev eth0 --interface %s"%self.vserverip
         try: