separate step for stopping all vservers

diff --git a/system/TestMain.py b/system/TestMain.py
index 5e23cae..6209b29 100755 (executable)
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -26,7 +26,7 @@ class TestMain:
                      'standby_6','nodes_ssh', 'check_slices','check_initscripts',
                      'check_tcp',
                      'kill_qemus', ]
-    other_steps = [ 'fresh_install', 'stop', 
+    other_steps = [ 'stop_all_vservers','fresh_install', 'stop', 
                     'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys',
                     'list_all_qemus', 'kill_qemus', 'stop_nodes' ,  
                     'db_dump' , 'db_restore',

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 4deba21..d76aff3 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -205,14 +205,17 @@ class TestPlc:
         self.run_in_host('rpm -e myplc')
         ##### Clean up the /plc directory
         self.run_in_host('rm -rf  /plc/data')
-        ##### stop any running vservers
-        self.run_in_host('for vserver in $(ls /vservers/* | sed -e s,/vservers/,,) ; do vserver $vserver stop ; done')
         return True
 
     def uninstall_vserver(self,options):
         self.run_in_host("vserver --silent %s delete"%self.vservername)
         return True
 
+    def stop_all_vservers (self,options):
+        ##### stop any running vservers
+        self.run_in_host('for vserver in $(ls /vservers/* | sed -e s,/vservers/,,) ; do vserver $vserver stop ; done')
+       return True
+
     def uninstall(self,options):
         # if there's a chroot-based myplc running, and then a native-based myplc is being deployed
         # it sounds safer to have the former uninstalled too
@@ -222,6 +225,7 @@ class TestPlc:
             self.uninstall_chroot(options)
         else:
             self.uninstall_chroot(options)
+           self.stop_all_vservers(options)
         return True
 
     ### install