Signed-off-by: Jiří Župka <[email protected]>
---
client/tests/kvm/multi_host.srv | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/client/tests/kvm/multi_host.srv b/client/tests/kvm/multi_host.srv
index 5aafeda..e54325f 100644
--- a/client/tests/kvm/multi_host.srv
+++ b/client/tests/kvm/multi_host.srv
@@ -22,6 +22,15 @@ AUTOTEST_DIR = job.clientdir
KVM_DIR = os.path.join(AUTOTEST_DIR, 'tests', 'kvm')
+CONTROL_MAIN_PART = """
+testname = "kvm"
+bindir = os.path.join(job.testdir, testname)
+job.install_pkg(testname, 'test', bindir)
+
+kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests', 'kvm')
+sys.path.append(kvm_test_dir)
+"""
+
try:
import autotest.common
except ImportError:
@@ -67,17 +76,10 @@ def run(machines):
ips = []
for machine in machines:
host = _hosts[machine]
- host.control = """
-testname = "kvm"
-bindir = os.path.join(job.testdir, testname)
-job.install_pkg(testname, 'test', bindir)
-
-kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests', 'kvm')
-sys.path.append(kvm_test_dir)
-"""
ips.append(host.host.ip)
for params in test_dicts:
+
params['hosts'] = ips
params['not_preprocess'] = "yes"
@@ -108,6 +110,10 @@ sys.path.append(kvm_test_dir)
for machine in machines:
host = _hosts[machine]
+ host.control = CONTROL_MAIN_PART
+
+ for machine in machines:
+ host = _hosts[machine]
host.control += ("job.run_test('kvm', tag='%s', params=%s)" %
(host.params['shortname'], host.params))
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
