@@ -2,6 +2,7 @@
import sys
import os
+import inspect
import time
import shelve
import random
@@ -21,26 +22,26 @@ class test_routine:
class kvm_runtest_2(test.test):
version = 1
+
def setup(self):
pass
def initialize(self):
- # Define the test routines corresponding to different values of the 'type' field
+ # directory where to look for tests
+ self.test_dir = os.path.join(self.bindir, "kvm_tests")
+
+ # pre-defined the test routines corresponding to different values of the 'type' field
self.test_routines = {
- # type module name routine
+ # type module name routine name
"steps": test_routine("kvm_guest_wizard", "run_steps"),
"stepmaker": test_routine("stepmaker", "run_stepmaker"),
- "boot": test_routine("kvm_tests", "run_boot"),
- "migration": test_routine("kvm_tests", "run_migration"),
- "yum_update": test_routine("kvm_tests", "run_yum_update"),
- "autotest": test_routine("kvm_tests", "run_autotest"),
"kvm_install": test_routine("kvm_install", "run_kvm_install"),
- "linux_s3": test_routine("kvm_tests", "run_linux_s3"),
}
-
+
# Make it possible to import modules from the test's bindir
sys.path.append(self.bindir)
-
+ sys.path.append(self.test_dir)
+
def run_once(self, params):
import kvm_log
import kvm_utils
@@ -74,6 +75,12 @@ class kvm_runtest_2(test.test):
type = params.get("type")
routine_obj = self.test_routines.get(type)
# If type could not be found in self.test_routines...
+ # look for test in kvm_tests directory, where type = 'testname'
+ # defined in file 'testname'.py and test routine method run_'testname'
+ if os.path.isfile(os.path.join(self.test_dir,type+".py")):
+ module_name = type
+ routine_name = "run_"+module_name
+ routine_obj = test_routine(module_name,routine_name)
if not routine_obj:
message = "Unsupported test type: %s" % type
kvm_log.error(message)
@@ -83,6 +90,13 @@ class kvm_runtest_2(test.test):
# Dynamically import the module
module = __import__(routine_obj.module_name)
# Get the needed routine
+ try:
+ inspect.isfunction(eval("module."+routine_obj.routine_name))
+ except Exception, e:
+ kvm_log.error("Test failed: %s" % e)
+ kvm_log.error("could not load:%s" % eval("module."+routine_obj.routine_name))
+ raise
+
routine_obj.routine = eval("module." + routine_obj.routine_name)
# Preprocess
Regardless of whether the idea should be implemented, I think the code can be simplified a bit, to look something like this: type = params.get("type") routine_obj = self.test_routines.get(type) if routine_obj: module_name = routine_obj.module_name routine_name = routine_obj.routine_name else: module_name = type routine_name = "run_" + type try: module = __import__(module_name) routine = eval("module." + routine_name) except: raise error.TestError("Could not find test routine for type '%s'" % type) # Preprocess ... Obviously this means that routine will be used instead of routine_obj.routine throughout the rest of run_once. We don't need inspect because if there's anything wrong with <module_name>.<routine_name>, the test will fail anyway and print the exception info like it does for normal failures. Also, there's no need to store test_dir as an attribute. Just do: sys.path.append(os.path.join(self.bindir, "kvm_tests")) Let me know what you think. ----- Original Message ----- From: "David Huff" <dhuff@redhat.com> To: kvm@vger.kernel.org Cc: "David Huff" <dhuff@redhat.com> Sent: Tuesday, May 26, 2009 7:27:00 PM (GMT+0200) Auto-Detected Subject: [PATCH] Modified kvm_runtest_2.py to look for tests in kvm_tests/ This will allow for adding of additional tests with out modifying the "code." One would just add the testname.py file to the test_dir and edit the comfig file. fixed typo --- client/tests/kvm_runtest_2/kvm_runtest_2.py | 32 +++++++++++++++++++------- 1 files changed, 23 insertions(+), 9 deletions(-)