miscell cosmetic + pass the substrate object to TestBonding so it can compute an...

[tests.git] / qaapi / qa / QAAPI.py

diff --git a/qaapi/qa/QAAPI.py b/qaapi/qa/QAAPI.py
index 8a11236..39ee19e 100644 (file)
--- a/qaapi/qa/QAAPI.py
+++ b/qaapi/qa/QAAPI.py
@@ -2,6 +2,7 @@ import sys, os
 import traceback
 import tests
 from Config import Config
+from tests.Test import Test
 from logger import log 
 
 class QAAPI:
@@ -70,14 +71,14 @@ class QAAPI:
         test_files.extend([test_base+file for file in map(remove_ext, filter(real_files, files))])
         
        # recurse through directory             
-        for (root, dirs, files) in iterator:
-            parts = root.split(os.sep)
-            for basename in basenames:
-                if basename in parts:
-                    test_base = ".".join(parts[parts.index(basename):])+"."
-            files = filter(real_files, files)
-            files = map(remove_ext, files)
-            test_files.extend([test_base+file for file in  files])
+        #for (root, dirs, files) in iterator:
+        #    parts = root.split(os.sep)
+        #    for basename in basenames:
+        #        if basename in parts:
+        #            test_base = ".".join(parts[parts.index(basename):])+"."
+        #    files = filter(real_files, files)
+        #    files = map(remove_ext, files)
+        #    test_files.extend([test_base+file for file in  files])
        return list(set(test_files)) 
 
     def callables(self, test_file):
@@ -95,12 +96,14 @@ class QAAPI:
        try:
            test = __import__(test_path, globals(), locals(), test_path)
            callables = []
-
            for attribute in dir(test):
                attr = getattr(test, attribute)
                if callable(attr) and hasattr(attr, 'status'):
                    setattr(attr, 'test_name', test_basename+attribute)
-                   callables.append(attr(self.config))
+                   try:
+                       test_instance = attr(self.config)
+                       callables.append(test_instance)
+                   except: pass
            return callables 
        except ImportError, AttributeError:
            raise