Merge branch 'embedded_tests' into pythonnet_master

vmuriart · vmuriart · commit 04ce393269aa · 2017-02-21T11:17:30.000-07:00
diff --git a/src/embed_tests/pyinitialize.cs b/src/embed_tests/pyinitialize.cs
@@ -5,16 +5,18 @@ namespace Python.EmbeddingTest
 {
     public class PyInitializeTest
     {
+        /// <summary>
+        /// Tests issue with multiple simple Initialize/Shutdowns.
+        /// Fixed by #343
+        /// </summary>
         [Test]
-        public static void LoadSpecificArgs()
+        public static void StartAndStopTwice()
         {
-            var args = new[] { "test1", "test2" };
-            using (new PythonEngine(args))
-            using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
-            {
-                Assert.AreEqual(args[0], argv[0].ToString());
-                Assert.AreEqual(args[1], argv[1].ToString());
-            }
+            PythonEngine.Initialize();
+            PythonEngine.Shutdown();
+
+            PythonEngine.Initialize();
+            PythonEngine.Shutdown();
         }
 
         [Test]
@@ -28,17 +30,24 @@ public static void LoadDefaultArgs()
         }
 
         [Test]
-        public static void StartAndStopTwice()
+        public static void LoadSpecificArgs()
         {
-            PythonEngine.Initialize();
-            PythonEngine.Shutdown();
-
-            PythonEngine.Initialize();
-            PythonEngine.Shutdown();
+            var args = new[] { "test1", "test2" };
+            using (new PythonEngine(args))
+            using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
+            {
+                Assert.AreEqual(args[0], argv[0].ToString());
+                Assert.AreEqual(args[1], argv[1].ToString());
+            }
         }
 
+        /// <summary>
+        /// Failing test demonstrating current issue with OverflowException (#376)
+        /// and ArgumentException issue after that one is fixed.
+        /// More complex version of StartAndStopTwice test
+        /// </summary>
         [Test]
-        [Ignore("System.OverflowException : Arithmetic operation resulted in an overflow")]
+        [Ignore("GH#376: System.OverflowException : Arithmetic operation resulted in an overflow")]
         //[Ignore("System.ArgumentException : Cannot pass a GCHandle across AppDomains")]
         public void ReInitialize()
         {
diff --git a/src/embed_tests/pytuple.cs b/src/embed_tests/pytuple.cs
@@ -5,6 +5,33 @@ namespace Python.EmbeddingTest
 {
     public class PyTupleTest
     {
+        /// <summary>
+        /// Test IsTupleType without having to Initialize a tuple.
+        /// PyTuple constructor use IsTupleType. This decouples the tests.
+        /// </summary>
+        [Test]
+        public void TestStringIsTupleType()
+        {
+            using (Py.GIL())
+            {
+                var s = new PyString("foo");
+                Assert.IsFalse(PyTuple.IsTupleType(s));
+            }
+        }
+
+        /// <summary>
+        /// Test IsTupleType with Tuple.
+        /// </summary>
+        [Test]
+        public void TestPyTupleIsTupleType()
+        {
+            using (Py.GIL())
+            {
+                var t = new PyTuple();
+                Assert.IsTrue(PyTuple.IsTupleType(t));
+            }
+        }
+
         [Test]
         public void TestPyTupleEmpty()
         {
@@ -15,7 +42,15 @@ public void TestPyTupleEmpty()
             }
         }
 
+        /// <remarks>
+        /// FIXME: Unable to unload AppDomain, Unload thread timed out.
+        /// Seen on Travis/AppVeyor on both PY2 and PY3. Causes Embedded_Tests
+        /// to hang after they are finished for ~40 seconds until nunit3 forces
+        /// a timeout on unloading tests. Doesn't fail the tests though but
+        /// greatly slows down CI. nunit2 silently has this issue.
+        /// </remarks>
         [Test]
+        [Ignore("GH#397: Travis/AppVeyor: Unable to unload AppDomain, Unload thread timed out")]
         public void TestPyTupleInvalidAppend()
         {
             using (Py.GIL())
@@ -39,18 +74,6 @@ public void TestPyTupleValidAppend()
             }
         }
 
-        [Test]
-        public void TestPyTupleIsTupleType()
-        {
-            using (Py.GIL())
-            {
-                var s = new PyString("foo");
-                var t = new PyTuple();
-                Assert.IsTrue(PyTuple.IsTupleType(t));
-                Assert.IsFalse(PyTuple.IsTupleType(s));
-            }
-        }
-
         [Test]
         public void TestPyTupleStringConvert()
         {
@@ -78,6 +101,9 @@ public void TestPyTupleValidConvert()
             }
         }
 
+        /// <remarks>
+        /// FIXME: Possible source of intermittent AppVeyor PY27: Unable to unload AppDomain.
+        /// </remarks>
         [Test]
         public void TestNewPyTupleFromPyTuple()
         {
