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
cannot use with
[tests.git]
/
system
/
TestBoxQemu.py
diff --git
a/system/TestBoxQemu.py
b/system/TestBoxQemu.py
index
e2527e7
..
6d118a1
100644
(file)
--- a/
system/TestBoxQemu.py
+++ b/
system/TestBoxQemu.py
@@
-7,6
+7,9
@@
import os.path
import utils
from TestSsh import TestSsh
import utils
from TestSsh import TestSsh
+# Apriol 2013 - using /vservers/ for hosting this stuff as well, making IT-like stuff easier
+KVMROOT="/vservers"
+
# xxx this should probably inherit TestSsh
class TestBoxQemu:
# xxx this should probably inherit TestSsh
class TestBoxQemu:
@@
-14,7
+17,7
@@
class TestBoxQemu:
self.hostname_value=hostname
self.buildname=buildname
self.key=key
self.hostname_value=hostname
self.buildname=buildname
self.key=key
- self.test_ssh=TestSsh(self.hostname_value,self.buildname,self.key)
+ self.test_ssh=TestSsh(self.hostname_value,self.buildname,self.key
,root=KVMROOT
)
def hostname (self):
return self.hostname_value
def hostname (self):
return self.hostname_value
@@
-22,18
+25,18
@@
class TestBoxQemu:
def is_local(self):
return self.test_ssh.is_local()
def is_local(self):
return self.test_ssh.is_local()
- def run_in_buildname (self,command,background=False):
+ def run_in_buildname (self,command,background=False
, dry_run=False
):
message="On %s: running %s"%(self.hostname(),command)
if background: message += " &"
utils.header(message)
message="On %s: running %s"%(self.hostname(),command)
if background: message += " &"
utils.header(message)
- return self.test_ssh.run_in_buildname (command,background)
+ return self.test_ssh.run_in_buildname (command,background
, dry_run
)
# xxx could/should use rsync instead
# xxx could/should use rsync instead
- def copy (self,local_file,recursive=False):
- return self.test_ssh.copy (local_file,recursive)
+ def copy (self,local_file,recursive=False
,dry_run=False
):
+ return self.test_ssh.copy (local_file,recursive
,dry_run=dry_run
)
- def
clean_dir (self,dirnam
e):
- return self.test_ssh.
clean_dir(dirname
)
+ def
rmdir (self,dirname, dry_run=Fals
e):
+ return self.test_ssh.
rmdir(dirname, dry_run=dry_run
)
def mkdir (self,dirname):
return self.test_ssh.mkdir(dirname)
def mkdir (self,dirname):
return self.test_ssh.mkdir(dirname)