Changeset 11

Timestamp:

10/10/2007 12:01:42 AM (15 months ago)

Author:

mikeal

Message:

Modularized the framework infrastructure to be more embeddable.

-Mikeal

Location:

trunk

Files:

• functest/__init__.py (modified) (1 diff)
• functest/bin.py (modified) (4 diffs)
• scripts/functest (modified) (1 diff)

trunk/functest/__init__.py

@@ +1 @@
+import bin, collector, formatter, frame, global_settings, reports, runner
+import os
+from time import sleep
+
+def configure(settings_module=global_settings, registry={}):
+    """Configure the framework"""
+    import functest
+    functest.registry = registry
+    functest.modules_passed = []
+    
+def run_framework(test_args=[], test_runner=None):
+    
+    if test_runner is None:
+        test_runner = runner.CLIRunner()
+        
+    tests = []    
+    test_runner.start()
+    if len(test_args) is not 0:
+        for arg in test_args:
+            tests.append( [ collector.create_test_module(arg), collector.create_module_chain(arg) ] )
+    else:
+        tests.append([collector.create_test_module(os.path.curdir), collector.create_module_chain(os.path.curdir) ])
+    
+    test_runner.wrap_stdout(global_settings.wrap_stdout, global_settings.wrap_stderr)
+    global_settings.test_runner = test_runner
+    totals = frame.execute(tests)
+    test_runner.summary(totals)
+    sleep(.5)

trunk/functest/bin.py

@@ -13 +13 @@
 #   limitations under the License.
 
-import collector
-import frame
 import global_settings
-import runner
-from time import sleep
 
-import os, sys
+import sys
 
 usage = """functest test framework.
@@ -35 +31 @@
     (filter=)  Only run tests where the name contains this filter."""
 
-def main(args):
+def main(test_args):
+    # tests = []
+    # cli_runner = runner.CLIRunner()
+    # cli_runner.start()
+    # if len(args) is not 0:
+    #     for arg in args:
+    #         tests.append( [ collector.create_test_module(arg), collector.create_module_chain(arg) ] )
+    # else:
+    #     tests.append([collector.create_test_module(os.path.curdir), collector.create_module_chain(os.path.curdir) ])
+    # cli_runner.wrap_stdout(global_settings.wrap_stdout, global_settings.wrap_stderr)
+    # global_settings.test_runner = cli_runner
+    # totals = frame.execute(tests)
+    # cli_runner.summary(totals)
+    # sleep(.5)    
+    
+    import functest
+    functest.run_framework(test_args)
 
-    tests = []
-    cli_runner = runner.CLIRunner()
-    cli_runner.start()
-    if len(args) is not 0:
-        for arg in args:
-            tests.append( [ collector.create_test_module(arg), collector.create_module_chain(arg) ] )
-    else:
-        tests.append([collector.create_test_module(os.path.curdir), collector.create_module_chain(os.path.curdir) ])
-    cli_runner.wrap_stdout(global_settings.wrap_stdout, global_settings.wrap_stderr)
-    global_settings.test_runner = cli_runner
-    totals = frame.execute(tests)
-    cli_runner.summary(totals)
-    sleep(.5)    
     
 def process_args():
+    import functest
+    functest.configure()
+    
     args = list(sys.argv)
     if args[0].endswith('functest') or args[0].endswith('functest.py') or args[0].endswith('functest.exe'):
@@ -68 +70 @@
     options = [ x.replace('--', '') for x in args ]
     
-    import functest
-    functest.registry = {}
-    functest.modules_passed = []
     for option in options:
         if option.find('=') is not -1:
@@ -85 +84 @@
     return functest.modules_passed
     
-if __name__ == "__main__":
-    main()
+

trunk/scripts/functest

@@ -14 +14 @@
 #   limitations under the License.
 
-from functest import bin
+import functest
 
 if __name__ == '__main__':
-    bin.main(bin.process_args())
+    functest.bin.main(functest.bin.process_args())