* Reordered test_* for namespace loading optimization.

Barton Cline · Barton Cline · commit ea34b6442a25 · 2011-03-04T09:18:42.000Z
* test_compat.py will stand alone with added import of System or clr
diff --git a/pythonnet/src/tests/runtests.py b/pythonnet/src/tests/runtests.py
@@ -22,19 +22,24 @@
     import clr
 
 test_modules = (
+        'test_module',  # Passes on its own, but not here if
+        # other test modules that import System.Windows.Forms
+        # run first. They must not do module level import/AddReference()
+        # of the System.Windows.Forms namespace.
+        'test_event',
+        'test_constructors',
+        'test_enum',
+        'test_method',
+        
         'test_exceptions',
-        'test_module',
         'test_compat',    
         'test_generic',
         'test_conversion',
         'test_class',
         'test_interface',
-        'test_enum',
         'test_field',
         'test_property',
         'test_indexer',
-        'test_event',
-        'test_method',
         'test_delegate',
         'test_array',
         'test_thread'
diff --git a/pythonnet/src/tests/test_compat.py b/pythonnet/src/tests/test_compat.py
@@ -262,5 +262,11 @@ def main():
     unittest.TextTestRunner().run(test_suite())
 
 if __name__ == '__main__':
+    try:
+        import System
+    except ImportError:
+        print "Load clr import hook"
+        import clr
+
     main()
 
