re-instate check-vsys-defaults as an ignored step

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 9447fd6..7134cc2 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -201,6 +201,12 @@ class TestNode:
         file.close()
         return True
 
+    def qemu_clean (self):
+        utils.header("Cleaning up qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
+        dry_run=self.dry_run()
+        self.test_box().rmdir(self.nodedir(), dry_run=dry_run)
+        return True
+
     def qemu_export (self):
         "all nodes: push local node-dep directory on the qemu box"
         # if relevant, push the qemu area onto the host box
@@ -208,7 +214,6 @@ class TestNode:
             return True
         dry_run=self.dry_run()
         utils.header ("Cleaning any former sequel of %s on %s"%(self.name(),self.host_box()))
-        self.test_box().rmdir(self.nodedir(), dry_run=dry_run)
         utils.header ("Transferring configuration files for node %s onto %s"%(self.name(),self.host_box()))
         return self.test_box().copy(self.nodedir(),recursive=True,dry_run=dry_run)==0
             
@@ -222,7 +227,7 @@ class TestNode:
             utils.header("TestNode.qemu_start : %s model %s taken as real node"%(self.name(),model))
         return True
 
-    def timestamp_qemu (self):
+    def qemu_timestamp (self):
         "all nodes: start the qemu instance (also runs qemu-bridge-init start)"
         test_box = self.test_box()
         test_box.run_in_buildname("mkdir -p %s"%self.nodedir(), dry_run=self.dry_run())
@@ -244,12 +249,6 @@ class TestNode:
         self.test_box().run_in_buildname(command, dry_run=self.dry_run())
         return True
 
-    def clean_qemu (self):
-        utils.header("Cleaning up qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
-        command="rm -rf %s"%(self.nodedir())
-        self.test_box().run_in_buildname(command, dry_run=self.dry_run())
-        return True
-
     def kill_qemu (self):
         #Prepare the log file before killing the nodes
         test_box = self.test_box()