example:
ovirt tests in client/tests/ovirt wants to use test from kvm/tests/
vm_type = ovirt
other_tests_dirs = "kvm"
This adds client/test/kvm/tests path to subtests dir group where
subtest will be searched.
Signed-off-by: Jiří Župka <jzupka@xxxxxxxxxx>
---
client/tests/kvm/tests-shared.cfg.sample | 4 ++++
client/virt/virt_test.py | 22 ++++++++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/client/tests/kvm/tests-shared.cfg.sample b/client/tests/kvm/tests-shared.cfg.sample
index c6304b3..534b5e3 100644
--- a/client/tests/kvm/tests-shared.cfg.sample
+++ b/client/tests/kvm/tests-shared.cfg.sample
@@ -13,6 +13,10 @@ include virtio-win.cfg
# Virtualization type (kvm or libvirt)
vm_type = kvm
+
+# Additional directory for find virt type tests. Relative to client/tests
+other_tests_dirs = ""
+
# The hypervisor uri (default, qemu://hostname/system, etc.)
# where default or unset means derive from installed system
connect_uri = default
diff --git a/client/virt/virt_test.py b/client/virt/virt_test.py
index 718979f..cf43359 100644
--- a/client/virt/virt_test.py
+++ b/client/virt/virt_test.py
@@ -57,21 +57,31 @@ class virt_test(test.test):
# Get the test routine corresponding to the specified
# test type
t_type = params.get("type")
+
+ subtest_dirs = []
+ tests_dir = self.job.testdir
+
+ other_subtests_dirs = params.get("other_tests_dirs", "")
+ for d in other_subtests_dirs.split():
+ subtestdir = os.path.join(tests_dir, d, "tests")
+ if not os.path.isdir(subtestdir):
+ raise error.TestError("Directory %s not"
+ " exist." % (subtestdir))
+ subtest_dirs.append(dir)
# Verify if we have the correspondent source file for it
virt_dir = os.path.dirname(virt_utils.__file__)
- subtest_dir_common = os.path.join(virt_dir, "tests")
- subtest_dir_test = os.path.join(self.bindir, "tests")
+ subtest_dirs.append(os.path.join(virt_dir, "tests"))
+ subtest_dirs.append(os.path.join(self.bindir, "tests"))
subtest_dir = None
- for d in [subtest_dir_test, subtest_dir_common]:
+ for d in subtest_dirs:
module_path = os.path.join(d, "%s.py" % t_type)
if os.path.isfile(module_path):
subtest_dir = d
break
if subtest_dir is None:
raise error.TestError("Could not find test file %s.py "
- "on either %s or %s directory" %
- (t_type, subtest_dir_test,
- subtest_dir_common))
+ "on tests dirs %s" %
+ (t_type, subtest_dirs))
# Load the test module
f, p, d = imp.find_module(t_type, [subtest_dir])
test_module = imp.load_module(t_type, f, p, d)
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
