git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
split qemu_export into clean & export, make it safer to re-use run_log
[tests.git]
/
system
/
TestNode.py
diff --git
a/system/TestNode.py
b/system/TestNode.py
index
9447fd6
..
c9d31f8
100644
(file)
--- a/
system/TestNode.py
+++ b/
system/TestNode.py
@@
-201,6
+201,12
@@
class TestNode:
file.close()
return True
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
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()))
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
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
@@
-244,12
+249,6
@@
class TestNode:
self.test_box().run_in_buildname(command, dry_run=self.dry_run())
return True
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()
def kill_qemu (self):
#Prepare the log file before killing the nodes
test_box = self.test_box()