Avoid Domain tests influence other tests when the default is not Soft or Reload

amos402 · amos402 · commit 3cb56f16bdd6 · 2020-02-13T18:11:18.000+08:00
diff --git a/src/embed_tests/TestDomainReload.cs b/src/embed_tests/TestDomainReload.cs
@@ -52,11 +52,20 @@ public static void DomainReloadAndGC()
         {
             Assert.IsFalse(PythonEngine.IsInitialized);
             RunAssemblyAndUnload("test1");
-
             Assert.That(Runtime.Runtime.Py_IsInitialized() != 0,
                 "On soft-shutdown mode, Python runtime should still running");
 
             RunAssemblyAndUnload("test2");
+            Assert.That(Runtime.Runtime.Py_IsInitialized() != 0,
+                "On soft-shutdown mode, Python runtime should still running");
+
+            if (PythonEngine.DefaultShutdownMode == ShutdownMode.Normal)
+            {
+                // The default mode is a normal mode,
+                // it should shutdown the Python VM avoiding influence other tests.
+                Runtime.Runtime.PyGILState_Ensure();
+                Runtime.Runtime.Py_Finalize();
+            }
         }
 
         [Test]
@@ -268,17 +277,12 @@ public static void ShutdownPythonCompletely()
             // if it used a another mode(the default mode) in other tests,
             // when other tests trying to access these reserved objects, it may cause Domain exception,
             // thus it needs to reduct to Soft mode to make sure all clr objects remove from Python.
-            if (PythonEngine.DefaultShutdownMode != ShutdownMode.Reload)
+            var defaultMode = PythonEngine.DefaultShutdownMode;
+            if (defaultMode != ShutdownMode.Reload)
             {
-                PythonEngine.ShutdownMode = ShutdownMode.Soft;
+                PythonEngine.ShutdownMode = defaultMode;
             }
             PythonEngine.Shutdown();
-            if (PythonEngine.DefaultShutdownMode == ShutdownMode.Normal)
-            {
-                // Normal mode will shutdown the VM, so it needs to be shutdown
-                // for avoiding influence with other tests.
-                Runtime.Runtime.Shutdown();
-            }
         }
 
         public static IntPtr GetTestObject()
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -6,8 +6,6 @@
 using System.Collections.Generic;
 using Python.Runtime.Platform;
 using System.Linq;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
 
 namespace Python.Runtime
 {
@@ -157,6 +155,14 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
                 {
                     RuntimeState.Save();
                 }
+#if !NETSTANDARD
+                // XXX: Reload mode may reduct to Soft mode,
+                // so even on Reload mode it still needs to save the RuntimeState
+                else if (mode == ShutdownMode.Reload)
+                {
+                    RuntimeState.Save();
+                }
+#endif
                 MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
             }
             else
diff --git a/src/runtime/runtime_state.cs b/src/runtime/runtime_state.cs
@@ -98,7 +98,7 @@ public static void Restore()
         private static void ResotreModules(IntPtr dummyGC)
         {
             var intialModules = PySys_GetObject("initial_modules");
-            Debug.Assert(intialModules != null);
+            Debug.Assert(intialModules != IntPtr.Zero);
             var modules = PyImport_GetModuleDict();
             foreach (var name in GetModuleNames())
             {

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using Python.Runtime.Platform;`
`8`	`8`	`using System.Linq;`
`9`		`-using System.IO;`
`10`		`-using System.Runtime.Serialization.Formatters.Binary;`
`11`	`9`
`12`	`10`	`namespace Python.Runtime`
`13`	`11`	`{`
`@@ -157,6 +155,14 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd`
`157`	`155`	`{`
`158`	`156`	`RuntimeState.Save();`
`159`	`157`	`}`
	`158`	`+#if !NETSTANDARD`
	`159`	`+ // XXX: Reload mode may reduct to Soft mode,`
	`160`	`+ // so even on Reload mode it still needs to save the RuntimeState`
	`161`	`+ else if (mode == ShutdownMode.Reload)`
	`162`	`+ {`
	`163`	`+ RuntimeState.Save();`
	`164`	`+ }`
	`165`	`+#endif`
`160`	`166`	`MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;`
`161`	`167`	`}`
`162`	`168`	`else`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public static void Restore()`
`98`	`98`	`private static void ResotreModules(IntPtr dummyGC)`
`99`	`99`	`{`
`100`	`100`	`var intialModules = PySys_GetObject("initial_modules");`
`101`		`- Debug.Assert(intialModules != null);`
	`101`	`+ Debug.Assert(intialModules != IntPtr.Zero);`
`102`	`102`	`var modules = PyImport_GetModuleDict();`
`103`	`103`	`foreach (var name in GetModuleNames())`
`104`	`104`	`{`