Use unittest.skip(...)

vmuriart · vmuriart · commit 4fcfc7864f76 · 2017-01-22T15:34:46.000-07:00
diff --git a/src/tests/runtests.py b/src/tests/runtests.py
@@ -47,10 +47,10 @@
     'test_thread',
     'test_docstring',
 
-    # FIXME: Fails due to unhandled exception
-    # 'test_engine',
+    # FIXME: Has tests that are being skipped.
+    'test_engine',
 
-    # FIXME: Fails in Linux
+    # FIXME: Randomly fails/passes on both Windows/Linux.
     # 'test_subclass',
 )
 
diff --git a/src/tests/test_engine.py b/src/tests/test_engine.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# FIXME: This test module fails due to unhandled exceptions
 
 import sys
 import unittest
@@ -20,12 +19,14 @@ def test_multiple_calls_to_initialize(self):
         except BaseException:
             self.fail("Initialize() raise an exception.")
 
+    @unittest.skip(reason="FIXME: test crashes")
     def test_import_module(self):
         """Test module import."""
         m = PythonEngine.ImportModule("sys")
         n = m.GetAttr("__name__")
         self.assertTrue(n.AsManagedObject(System.String) == "sys")
 
+    @unittest.skip(reason="FIXME: test freezes")
     def test_run_string(self):
         """Test the RunString method."""
         PythonEngine.AcquireLock()
diff --git a/src/tests/test_exceptions.py b/src/tests/test_exceptions.py
@@ -307,23 +307,22 @@ def test_pickling_exceptions(self):
 
         self.assertEqual(exc.args, loaded.args)
 
+    @unittest.skipIf(PY2, "__cause__ isn't implemented in PY2")
     def test_chained_exceptions(self):
-        # __cause__ is py3 only
-        if PY3:
-            from Python.Test import ExceptionTest
-
-            try:
-                ExceptionTest.ThrowChainedExceptions()
-            except Exception as exc:
-                msgs = ("Outer exception",
-                        "Inner exception",
-                        "Innermost exception",)
-                for msg in msgs:
-                    self.assertEqual(exc.Message, msg)
-                    self.assertEqual(exc.__cause__, exc.InnerException)
-                    exc = exc.__cause__
-            else:
-                self.fail("Test should raise an exception")
+        from Python.Test import ExceptionTest
+
+        try:
+            ExceptionTest.ThrowChainedExceptions()
+        except Exception as exc:
+            msgs = ("Outer exception",
+                    "Inner exception",
+                    "Innermost exception",)
+            for msg in msgs:
+                self.assertEqual(exc.Message, msg)
+                self.assertEqual(exc.__cause__, exc.InnerException)
+                exc = exc.__cause__
+        else:
+            self.fail("Test should raise an exception")
 
 
 def test_suite():
diff --git a/src/tests/test_subclass.py b/src/tests/test_subclass.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-# FIXME: This test module fails on Linux
+# FIXME: This test module randomly passes/fails even if all tests are skipped.
+# Something fishy is going on with the Test fixtures. Behavior seen on CI on
+# both Linux and Windows
 
 import unittest
 
@@ -66,9 +68,11 @@ def OnTestEvent(self, value):
             handler(self, args)
 
 
+@unittest.skip(reason="FIXME: test randomly pass/fails")
 class SubClassTests(unittest.TestCase):
     """Test sub-classing managed types"""
 
+    @unittest.skip(reason="FIXME: test randomly pass/fails")
     def test_base_class(self):
         """Test base class managed type"""
         ob = SubClassTest()
@@ -80,6 +84,7 @@ def test_base_class(self):
         self.assertEqual(list(ob.return_list()), ["a", "b", "c"])
         self.assertEqual(list(SubClassTest.test_list(ob)), ["a", "b", "c"])
 
+    @unittest.skip(reason="FIXME: test randomly pass/fails")
     def test_interface(self):
         """Test python classes can derive from C# interfaces"""
         ob = InterfaceTestClass()
@@ -91,6 +96,7 @@ def test_interface(self):
         x = FunctionsTest.pass_through(ob)
         self.assertEqual(id(x), id(ob))
 
+    @unittest.skip(reason="FIXME: test randomly pass/fails")
     def test_derived_class(self):
         """Test python class derived from managed type"""
         ob = DerivedClass()
@@ -107,6 +113,7 @@ def test_derived_class(self):
         x = FunctionsTest.pass_through(ob)
         self.assertEqual(id(x), id(ob))
 
+    @unittest.skip(reason="FIXME: test randomly pass/fails")
     def test_create_instance(self):
         """Test derived instances can be created from managed code"""
         ob = FunctionsTest.create_instance(DerivedClass)
@@ -128,6 +135,7 @@ def test_create_instance(self):
         y = FunctionsTest.pass_through(ob2)
         self.assertEqual(id(y), id(ob2))
 
+    @unittest.skip(reason="FIXME: test randomly pass/fails")
     def test_events(self):
         class EventHandler(object):
             def handler(self, x, args):
@@ -150,6 +158,7 @@ def handler(self, x, args):
         self.assertEqual(event_handler.value, 3)
         self.assertEqual(len(d.event_handlers), 1)
 
+    @unittest.skip(reason="FIXME: test randomly pass/fails")
     def test_isinstance(self):
         a = [str(x) for x in range(0, 1000)]
         b = [System.String(x) for x in a]
