Fix refactored tests

pythonnet · filmor · Sep 23, 2023 · Sep 23, 2023 · Sep 23, 2023 · Sep 23, 2023
commit 4fe3757636be91e9fe52c3a7029c089f79146e12
diff --git a/src/embed_tests/BaseFixture.cs b/src/embed_tests/BaseFixture.cs
@@ -14,7 +14,7 @@ public void BaseSetup()
     [OneTimeTearDown]
     public void BaseTearDown()
     {
-        PyObjectConversions.Reset();
         PythonEngine.Shutdown(allowReload: true);
+        PyObjectConversions.Reset();
     }
 }
diff --git a/src/embed_tests/Codecs.cs b/src/embed_tests/Codecs.cs
@@ -9,6 +9,12 @@ namespace Python.EmbeddingTest;
 
 public class Codecs : BaseFixture
 {
+    [SetUp]
+    public void SetUp()
+    {
+        PyObjectConversions.Reset();
+    }
+
     [Test]
     public void TupleConversionsGeneric()
     {

diff --git a/src/embed_tests/TestDomainReload.cs b/src/embed_tests/TestDomainReload.cs
@@ -367,14 +367,13 @@ public static void InitPython(string dllName)
         public static void ShutdownPython()
         {
             PythonEngine.EndAllowThreads(_state);
-            PythonEngine.Shutdown();
+            PythonEngine.Shutdown(allowReload: true);
         }
 
         public static void ShutdownPythonCompletely()
         {
             PythonEngine.EndAllowThreads(_state);
-
-            PythonEngine.Shutdown();
+            PythonEngine.Shutdown(allowReload: true);
         }
 
         static void OnDomainUnload(object sender, EventArgs e)

diff --git a/src/embed_tests/TestFinalizer.cs b/src/embed_tests/TestFinalizer.cs
@@ -26,7 +26,7 @@ public void SetUp()
     public void TearDown()
     {
         Finalizer.Instance.Threshold = _oldThreshold;
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     private static void FullGCCollect()
@@ -89,7 +89,7 @@ public void CollectBasicObject()
     }
 
     [Test]
-    [Obsolete("GC tests are not guaranteed")]
+    // [Obsolete("GC tests are not guaranteed")]
     public void CollectOnShutdown()
     {
         IntPtr op = MakeAGarbage(out var shortWeak, out var longWeak);
@@ -100,7 +100,7 @@ public void CollectOnShutdown()
         Assert.IsTrue(garbage.Contains(op),
             "Garbage should contains the collected object");
 
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
         garbage = Finalizer.Instance.GetCollectedObjects();
 
         if (garbage.Count > 0)

diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -79,7 +79,7 @@ public static void GetPythonPathDefault()
         string s = PythonEngine.PythonPath;
 
         StringAssert.Contains("python", s.ToLower());
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     [Test]
@@ -89,7 +89,7 @@ public static void GetProgramNameDefault()
         string s = PythonEngine.ProgramName;
 
         Assert.NotNull(s);
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     /// <summary>
@@ -105,15 +105,15 @@ public static void GetPythonHomeDefault()
         string enginePythonHome = PythonEngine.PythonHome;
 
         Assert.AreEqual(envPythonHome, enginePythonHome);
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     [Test]
     public void SetPythonHome()
     {
         PythonEngine.Initialize();
         var pythonHomeBackup = PythonEngine.PythonHome;
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
 
         if (pythonHomeBackup == "")
             Assert.Inconclusive("Can't reset PythonHome to empty string, skipping");
@@ -124,7 +124,7 @@ public void SetPythonHome()
         PythonEngine.Initialize();
 
         Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
 
         // Restoring valid pythonhome.
         PythonEngine.PythonHome = pythonHomeBackup;
@@ -135,7 +135,7 @@ public void SetPythonHomeTwice()
     {
         PythonEngine.Initialize();
         var pythonHomeBackup = PythonEngine.PythonHome;
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
 
         if (pythonHomeBackup == "")
             Assert.Inconclusive("Can't reset PythonHome to empty string, skipping");
@@ -147,7 +147,7 @@ public void SetPythonHomeTwice()
         PythonEngine.Initialize();
 
         Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
 
         PythonEngine.PythonHome = pythonHomeBackup;
     }
@@ -161,23 +161,23 @@ public void SetPythonHomeEmptyString()
         var backup = PythonEngine.PythonHome;
         if (backup == "")
         {
-            PythonEngine.Shutdown();
+            PythonEngine.Shutdown(allowReload: true);
             Assert.Inconclusive("Can't reset PythonHome to empty string, skipping");
         }
         PythonEngine.PythonHome = "";
 
         Assert.AreEqual("", PythonEngine.PythonHome);
 
         PythonEngine.PythonHome = backup;
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     [Test]
     public void SetProgramName()
     {
         if (PythonEngine.IsInitialized)
         {
-            PythonEngine.Shutdown();
+            PythonEngine.Shutdown(allowReload: true);
         }
 
         var programNameBackup = PythonEngine.ProgramName;
@@ -188,7 +188,7 @@ public void SetProgramName()
         PythonEngine.Initialize();
 
         Assert.AreEqual(programName, PythonEngine.ProgramName);
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
 
         PythonEngine.ProgramName = programNameBackup;
     }
@@ -220,14 +220,14 @@ public void SetPythonPath()
         // See https://docs.python.org/3/c-api/init.html#c.Py_GetPath
         // After PythonPath is set, then PythonEngine.PythonPath will correctly return the full search path.
 
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
 
         PythonEngine.PythonPath = path;
         PythonEngine.Initialize();
 
         Assert.AreEqual(path, PythonEngine.PythonPath);
         if (importShouldSucceed) Py.Import(moduleName);
 
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
     }
 }
diff --git a/src/embed_tests/pyinitialize.cs b/src/embed_tests/pyinitialize.cs
@@ -13,38 +13,36 @@ public class PyInitializeTest
     public static void StartAndStopTwice()
     {
         PythonEngine.Initialize();
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
 
         PythonEngine.Initialize();
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     [Test]
     public static void LoadDefaultArgs()
     {
-        using (new PythonEngine())
+        PythonEngine.Initialize();
+        using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
         {
-            using(var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
-            {
-                Assert.AreNotEqual(0, argv.Length());
-            }
+            Assert.AreNotEqual(0, argv.Length());
         }
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     [Test]
     public static void LoadSpecificArgs()
     {
         var args = new[] { "test1", "test2" };
-        using (new PythonEngine(args))
+        PythonEngine.Initialize(args);
+        using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
         {
-            using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
-            {
-                using var v0 = argv[0];
-                using var v1 = argv[1];
-                Assert.AreEqual(args[0], v0.ToString());
-                Assert.AreEqual(args[1], v1.ToString());
-            }
+            using var v0 = argv[0];
+            using var v1 = argv[1];
+            Assert.AreEqual(args[0], v0.ToString());
+            Assert.AreEqual(args[1], v1.ToString());
         }
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     // regression test for https://github.com/pythonnet/pythonnet/issues/1561
@@ -63,7 +61,7 @@ public void ImportClassShutdownRefcount()
 
         Assert.Less(Runtime.Runtime.Refcount32(clsRef), 256);
 
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
         Assert.Greater(Runtime.Runtime.Refcount32(clsRef), 0);
     }
 
@@ -73,7 +71,6 @@ public void ImportClassShutdownRefcount()
     /// More complex version of StartAndStopTwice test
     /// </summary>
     [Test]
-    [Ignore("GH#376: System.OverflowException : Arithmetic operation resulted in an overflow")]
     //[Ignore("System.ArgumentException : Cannot pass a GCHandle across AppDomains")]
     public void ReInitialize()
     {
@@ -84,7 +81,7 @@ public void ReInitialize()
             // Import any class or struct from .NET
             PythonEngine.RunSimpleString(code);
         }
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
 
         PythonEngine.Initialize();
         using (Py.GIL())
@@ -97,7 +94,7 @@ public void ReInitialize()
             // If replacing int with Int64, OverflowException will be replaced with AppDomain exception.
             PythonEngine.RunSimpleString("Int32(1)");
         }
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
     }
 
     /// <summary>
@@ -123,15 +120,15 @@ public void ShutdownHandlers()
         shutdown_count = 0;
         PythonEngine.Initialize();
         PythonEngine.AddShutdownHandler(OnShutdownIncrement);
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
         Assert.That(shutdown_count, Is.EqualTo(1));
 
         // Test we can run multiple shutdown handlers in the right order.
         shutdown_count = 4;
         PythonEngine.Initialize();
         PythonEngine.AddShutdownHandler(OnShutdownIncrement);
         PythonEngine.AddShutdownHandler(OnShutdownDouble);
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
         // Correct: 4 * 2 + 1 = 9
         // Wrong:  (4 + 1) * 2 = 10
         Assert.That(shutdown_count, Is.EqualTo(9));
@@ -145,7 +142,7 @@ public void ShutdownHandlers()
         PythonEngine.AddShutdownHandler(OnShutdownIncrement);
         PythonEngine.AddShutdownHandler(OnShutdownDouble);
         PythonEngine.RemoveShutdownHandler(OnShutdownDouble);
-        PythonEngine.Shutdown();
+        PythonEngine.Shutdown(allowReload: true);
         // Correct: (4 + 1) * 2 + 1 + 1 = 12
         // Wrong:   (4 * 2) + 1 + 1 + 1 = 11
         Assert.That(shutdown_count, Is.EqualTo(12));