Changeset 36

Timestamp:

03/14/2008 06:40:29 PM (10 months ago)

Author:

mikeal

Message:

Fixing imports of modules that do not begin with 'test'.

-Mikeal

Files:

• trunk/functest/collector.py (modified) (4 diffs)

trunk/functest/collector.py

@@ -32 +32 @@
             module = imp.load_module(name, filename, pathname, description)
             module.functest_module_path = path
+            module.__file__ = os.path.abspath(path)
             sys.path.pop(0)
         elif os.path.isdir(path):
@@ -41 +42 @@
                 module = imp.load_module(name, filename, pathname, description)
                 module.functest_module_path = path
+                module.__file__ = os.path.abspath(path+'.__init__.py')
                 sys.path.pop(0)
             else:
@@ -58 +60 @@
         while os.path.isfile(os.path.join(path, '__init__.py')):
             module_chain.append(self.import_module(path))
-            split = list(os.path.split(path))
-            split.pop(-1)
-            path = os.path.join(*split)
+            path = os.path.join(*os.path.split(path)[-1])
         module_chain.reverse()
         return module_chain
@@ -75 +75 @@
                 func(test_module)
             for filename in [ f for f in os.listdir(path) if ( not f.startswith('.') ) and 
+                             ( f.startswith('test') ) and
                              ( ( f.endswith('.py') ) or 
                                ( os.path.isdir(os.path.join(path, f)) and        
-                                 os.path.isfile(os.path.join(path, f, '__init__.py')) ) 
-                             ) ]:
+                                 os.path.isfile(os.path.join(path, f, '__init__.py')) 
+                               ) 
+                             ) 
+                             ]:
                 setattr(test_module, filename.split('.')[0], self.create_test_module(os.path.join(path, filename)))
         else: