Changeset 2660

Timestamp:

Jun 15, 2010 1:13:16 AM (11 years ago)

Author:

wehart

Message:

Further evolution of this capability. This still doesn't quite work, but I'm
getting close.

Location:

coopr.testing/trunk

Files:

• coopr/testing/__init__.py (modified) (1 diff)
• coopr/testing/colin_driver.py (added)
• coopr/testing/coopr_driver.py (added)
• coopr/testing/coopr_test_driver.py (added)
• coopr/testing/driver.py (modified) (4 diffs)
• coopr/testing/plugins.py (modified) (1 diff)
• coopr/testing/pyomo_driver.py (added)
• coopr/testing/yaml_plugin.py (modified) (3 diffs)
• setup.py (modified) (1 diff)

coopr.testing/trunk/coopr/testing/__init__.py

@@ -15 +15 @@
 import yaml_plugin
 import driver
+import coopr_driver
+import colin_driver
+import pyomo_driver
 
 pyutilib.component.core.PluginGlobals.pop_env()

coopr.testing/trunk/coopr/testing/driver.py

@@ -1 +1 @@
 
-__all__ = ['main', 'create_test_suite']
+__all__ = ['main', 'create_test_suites']
 
 import os
@@ -6 +6 @@
 import optparse
 import plugins
+from pyutilib.misc import Options
 from pyutilib.component.core import ExtensionPoint, PluginGlobals
+import pyutilib.th as unittest
 
 
-def create_test_suite(filename):
-    ep = ExtensionPoint(plugins.ITestDriver)
+def validate_test_config(suite):
+    tmp = set(suite.keys())
+    if not tmp.issubset(set(['python','solvers','problems','suites', 'driver'])):
+        raise IOError, "Unexpected test sections: "+str(suite.keys())
+    #
+    if 'python' in suite:
+        if not type(suite['python']) is list:
+            raise IOError, "Expected list of Python expressions"
+    #
+    if 'solvers' in suite:
+        if not type(suite['solvers']) is dict:
+            raise IOError, "Expected dictionary of solvers"
+        for key in suite['solvers']:
+            if not type(suite['solvers'][key]) is dict:
+                raise IOError, "Expected solvers to have a dictionary of options"
+    #
+    if 'problems' in suite:
+        if not type(suite['problems']) is dict:
+            raise IOError, "Expected dictionary of problems"
+        for key in suite['problems']:
+            if not type(suite['problems'][key]) is dict:
+                raise IOError, "Expected problems to have a dictionary of options"
+    #
+    if 'suites' in suite:
+        if not type(suite['suites']) is dict:
+            raise IOError, "Expected dictionary of suites"
+        for key in suite['suites']:
+            if not type(suite['suites'][key]) is dict:
+                raise IOError, "Expected suites to have a dictionary of options"
+
+
+
+def create_test_suites(filename, _globals, options=Options):
+    ep = ExtensionPoint(plugins.ITestParser)
     ftype = os.path.splitext(filename)[1]
     if not ftype == '':
@@ -16 +50 @@
     service = ep.service(ftype)
     if service is None:
-        raise IOError, "Unknown file type.  Cannot load suites from file '%s'" % filename
-    suite = service.load_test_suite(filename)
+        raise IOError, "Unknown file type.  Cannot load test configuration from file '%s'" % filename
+    config = service.load_test_config(filename)
+    #service.print_test_config(config)
+    validate_test_config(config)
+    #
+    # Create test driver, which is put in the global namespace
+    #
+    driver = plugins.TestDriverFactory(config['driver'])
+    if driver is None:
+        raise IOError, "Unexpected test driver '%s'" % config['driver']
+    _globals["test_driver"] = driver
+    #
+    # Evaluate Python expressions
+    #
+    for item in config.get('python',[]):
+        try:
+            eval(item, _globals)
+        except Exception, err:
+            print "ERROR evaluating '%s'" % item
+    #
+    # Generate suite
+    #
+    for suite in config.get('suites',{}):
+        create_test_suite(suite, config, _globals, options)
+
+
+def create_test_suite(suite, config, _globals, options):
+    #
+    # Skip suite creation if the options category is not in the list of test suite categories
+    #
+    if not (options.category is None or options.category in config['suites'][suite].get('categories',[])):
+        return
+    #
+    # Create test driver
+    #
+    print "X",suite
+    #class tmp(unittest.TestCase): pass
+    _globals["TestSuite_"+suite] = type("TestSuite_"+suite,(unittest.TestCase,),{})
+    #tmp = _globals["TestSuite_"+suite]
+    #
+    # Create test functions
+    #
+    print "HERE",suite
+    for solver in config['suites'][suite]['solvers']:
+        if 'name' in solver:
+            sname = solver['name']
+        else:
+            sname = solver['solver']
+        for problem in config['suites'][suite]['problems']:
+            test_name = sname+"_"+problem
+            print test_name
+            options = Options()
+            options.solver = sname
+            options.problem = problem
+            def fn(name):
+                return test_driver.run_test(name, fn._options)
+            fn._options = options
+            _globals["TestSuite_"+suite].add_fn_test(name=test_name, fn=fn)
+    #
+    # Set the name of this class in the global namespace
+    #
+    print dir(_globals["TestSuite_"+suite])
+
 
 
 def main():
+
     parser = optparse.OptionParser()
 
     parser.add_option('-d','--debug',
-        action='store',
+        action='store_true',
         dest='debug',
         default=False,
         help='Set debugging flag')
+
+    parser.add_option('-v','--verbose',
+        action='store_true',
+        dest='verbose',
+        default=False,
+        help='Set flag for verbose output')
+
+    parser.add_option('-q','--quiet',
+        action='store_true',
+        dest='quiet',
+        default=False,
+        help='Set flag for quiet output')
+
+    parser.add_option('--category',
+        action='store',
+        dest='category',
+        default=None,
+        help='Define the category of the test suite that is executed')
    
     options, args = parser.parse_args(sys.argv)
@@ -36 +150 @@
 
     for file in args[1:]:
-        create_test_suite(file)
+        create_test_suites(file, globals(), options)
+
+    tmp = [args[0]]
+    if options.quiet:
+        tmp.append('-q')
+    if options.verbose or options.debug:
+        tmp.append('-v')
+    #tmp += args
+    sys.argv = tmp
+    print "X",sys.argv
+    print "X",globals().keys()
+    print "X",dir(globals()['TestSuite_ps'])
+    print dir(globals()['__name__'])
+    unittest.main(module=globals()['__name__'])
         
         

coopr.testing/trunk/coopr/testing/plugins.py

@@ -1 +1 @@
 
-__all__ = ['ITestDriver']
+__all__ = ['ITestDriver', 'TestDriverFactory', 'ITestParser']
 
 from pyutilib.component.core import *
 
-class ITestDriver(Interface):
+class ITestParser(Interface):
 
-    def load_test_suite(self, filename):
+    def load_test_config(self, filename):
+        pass
+
+    def print_test_config(self, repn):
         pass
 
 
+class ITestDriver(Interface):
+
+    def run_test(self, options):
+        pass
+
+TestDriverFactory = CreatePluginFactory(ITestDriver)

coopr.testing/trunk/coopr/testing/yaml_plugin.py

@@ -10 +10 @@
 
 
-class YamlTestDriver(SingletonPlugin):
+class YamlTestParser(SingletonPlugin):
 
-    implements(plugins.ITestDriver)
+    implements(plugins.ITestParser)
 
     def __init__(self, **kwds):
@@ -18 +18 @@
         self.name='yml'
 
-    def load_test_suite(self, filename):
+    def load_test_config(self, filename):
         INPUT = open(filename, 'r')
         repn = yaml.load(INPUT, yaml.SafeLoader)
@@ -24 +24 @@
         return repn
 
+    def print_test_config(self, repn):
+        print repn
+

coopr.testing/trunk/setup.py

@@ -70 +70 @@
       entry_points="""
         [console_scripts]
-        coopr_test_driver = coopr.testing.driver:main
+        coopr_test_driver = coopr.testing.coopr_test_driver:main
       """
       )