Sanitize how to run tests

* Remove unsupported entry points * Adds reference to Python.Test by default for all tests * Remove redundant add_reference * Avoid some implicit AddReferences that were being done Not all tests added reference to Python.Test consistently. Solve this by making `run_test` the only supported method.
pythonnet · vmuriart · Jan 22, 2017 · Jan 22, 2017 · Jan 22, 2017 · Jan 22, 2017
commit 0e26b1a43dd81ef7ce6dfcf7d40fa96730855067
diff --git a/src/tests/runtests.py b/src/tests/runtests.py
@@ -16,6 +16,10 @@
 except ImportError:
     print("Load clr import hook")
     import clr
+    clr.AddReference("Python.Test")
+    clr.AddReference("System.Collections")
+    clr.AddReference("System.Data")
+    clr.AddReference("System.Management")
 
 test_modules = (
     # Passes on its own, but not here if

diff --git a/src/tests/stresstest.py b/src/tests/stresstest.py
@@ -18,6 +18,10 @@
 except ImportError:
     print("Load clr import hook")
     import clr
+    clr.AddReference("Python.Test")
+    clr.AddReference("System.Collections")
+    clr.AddReference("System.Data")
+    clr.AddReference("System.Management")
 
 
 def main():

diff --git a/src/tests/test_array.py b/src/tests/test_array.py
@@ -1480,11 +1480,3 @@ def test():
 
 def test_suite():
     return unittest.makeSuite(ArrayTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_class.py b/src/tests/test_class.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import clr
 import types
 import unittest
 
@@ -280,11 +279,3 @@ def kind(self):
 
 def test_suite():
     return unittest.makeSuite(ClassTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_compat.py b/src/tests/test_compat.py
@@ -159,9 +159,6 @@ def testDottedNameImportFromWithAlias(self):
 
     def testFromModuleImportStar(self):
         """Test from module import * behavior."""
-        import clr
-        clr.AddReference("System.Management")
-
         count = len(locals().keys())
         m = __import__('CLR.System.Management', globals(), locals(), ['*'])
         self.assertTrue(m.__name__ == 'System.Management')
@@ -262,17 +259,3 @@ def test000MultipleImports(self):
 
 def test_suite():
     return unittest.makeSuite(CompatibilityTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    try:
-        import System
-    except ImportError:
-        print("Load clr import hook")
-        import clr
-
-    main()
diff --git a/src/tests/test_constructors.py b/src/tests/test_constructors.py
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import unittest
-import clr
-
-clr.AddReference("Python.Test")
-import Python.Test as Test
 import System
 
 
@@ -51,11 +47,3 @@ class sub(System.Exception):
 
 def test_suite():
     return unittest.makeSuite(ConstructorTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_conversion.py b/src/tests/test_conversion.py
@@ -836,11 +836,3 @@ def testSByteArrayConversion(self):
 
 def test_suite():
     return unittest.makeSuite(ConversionTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_delegate.py b/src/tests/test_delegate.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import clr
-
-clr.AddReference('Python.Test')
-
 from Python.Test import DelegateTest, PublicDelegate
 from Python.Test import StringDelegate, ObjectDelegate
 from Python.Test import BoolDelegate
@@ -319,11 +315,3 @@ def always_so_negative():
 
 def test_suite():
     return unittest.makeSuite(DelegateTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_docstring.py b/src/tests/test_docstring.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import unittest
-import clr
-
-clr.AddReference('Python.Test')
 
 from Python.Test import DocWithCtorTest, DocWithoutCtorTest, DocWithCtorNoDocTest
 
@@ -29,11 +26,3 @@ def testDocWithoutCtor(self):
 
 def test_suite():
     return unittest.makeSuite(DocStringTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_engine.py b/src/tests/test_engine.py
@@ -39,11 +39,3 @@ def testRunString(self):
 
 def test_suite():
     return unittest.makeSuite(EngineTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_enum.py b/src/tests/test_enum.py
@@ -148,11 +148,3 @@ def test():
 
 def test_suite():
     return unittest.makeSuite(EnumTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_event.py b/src/tests/test_event.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import clr
-
-clr.AddReference('Python.Test')
-
 import unittest
 from Python.Test import EventTest, TestEventHandler
 from Python.Test import TestEventArgs
@@ -678,11 +674,3 @@ def handler(self, sender, args):
 
 def test_suite():
     return unittest.makeSuite(EventTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_exceptions.py b/src/tests/test_exceptions.py
@@ -372,11 +372,3 @@ def testChainedExceptions(self):
 
 def test_suite():
     return unittest.makeSuite(ExceptionTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_field.py b/src/tests/test_field.py
@@ -426,11 +426,3 @@ def test():
 
 def test_suite():
     return unittest.makeSuite(FieldTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_generic.py b/src/tests/test_generic.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import clr
-
-clr.AddReference('Python.Test')
-
 from System.Collections.Generic import Dictionary, List
 import unittest
 import Python.Test as Test
@@ -795,11 +792,3 @@ def testNestedGenericClass(self):
 
 def test_suite():
     return unittest.makeSuite(GenericTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_indexer.py b/src/tests/test_indexer.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import unittest
-import clr
 
-clr.AddReference("Python.Test")
 import Python.Test as Test
 import six
 
@@ -679,11 +677,3 @@ def test():
 
 def test_suite():
     return unittest.makeSuite(IndexerTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_interface.py b/src/tests/test_interface.py
@@ -77,11 +77,3 @@ def testExplicitCastToInterface(self):
 
 def test_suite():
     return unittest.makeSuite(InterfaceTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_method.py b/src/tests/test_method.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import unittest
-import clr
-
-clr.AddReference("Python.Test")
 
 from Python.Test import MethodTest, MethodTestSub
 import System
@@ -786,11 +783,3 @@ def testWeCanBindToEncodingGetString(self):
 
 def test_suite():
     return unittest.makeSuite(MethodTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_module.py b/src/tests/test_module.py
@@ -2,11 +2,6 @@
 
 import clr
 
-clr.AddReference('Python.Test')
-clr.AddReference('System.Data')
-
-# testImplicitAssemblyLoad() passes on deprecation warning; perfect! #
-##clr.AddReference('System.Windows.Forms')
 import unittest
 import types
 import warnings
@@ -18,6 +13,9 @@
 else:
     ClassType = types.ClassType
 
+# testImplicitAssemblyLoad() passes on deprecation warning; perfect! #
+# clr.AddReference('System.Windows.Forms')
+
 
 class ModuleTests(unittest.TestCase):
     """Test CLR modules and the CLR import hook."""
@@ -383,11 +381,3 @@ def test_AssemblyLoadThreadSafety(self):
 
 def test_suite():
     return unittest.makeSuite(ModuleTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_property.py b/src/tests/test_property.py
@@ -179,11 +179,3 @@ def testInterfaceProperty(self):
 
 def test_suite():
     return unittest.makeSuite(PropertyTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_subclass.py b/src/tests/test_subclass.py
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import clr
-
-clr.AddReference('Python.Test')
-clr.AddReference('System')
-
 import unittest
 from Python.Test import TestFunctions, SubClassTest, IInterfaceTest, TestEventArgs
 from System.Collections.Generic import List
@@ -167,11 +163,3 @@ def test_isinstance(self):
 
 def test_suite():
     return unittest.makeSuite(SubClassTests)
-
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/tests/test_thread.py b/src/tests/test_thread.py
@@ -68,12 +68,3 @@ def start_threads(count):
 
 def test_suite():
     return unittest.makeSuite(ThreadTests)
-
-
-def main():
-    for i in range(50):
-        unittest.TextTestRunner().run(test_suite())
-
-
-if __name__ == '__main__':
-    main()