TestPythonEngineProperties fixes.

dse · filmor · commit d3315d490682 · 2018-11-14T14:38:47.000+01:00
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using NUnit.Framework;
 using Python.Runtime;
 
@@ -109,18 +110,41 @@ public static void GetPythonHomeDefault()
         [Test]
         public void SetPythonHome()
         {
+            // We needs to ensure that engine was started and shutdown at least once before setting dummy home.
+            // Otherwise engine will not run with dummy path with random problem.
+            if (!PythonEngine.IsInitialized)
+            {
+                PythonEngine.Initialize();
+            }
+
+            PythonEngine.Shutdown();
+
+            var pythonHomeBackup = PythonEngine.PythonHome;
+
             var pythonHome = "/dummypath/";
 
             PythonEngine.PythonHome = pythonHome;
             PythonEngine.Initialize();
 
-            Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
             PythonEngine.Shutdown();
+
+            // Restoring valid pythonhome.
+            PythonEngine.PythonHome = pythonHomeBackup;
         }
 
         [Test]
         public void SetPythonHomeTwice()
         {
+            // We needs to ensure that engine was started and shutdown at least once before setting dummy home.
+            // Otherwise engine will not run with dummy path with random problem.
+            if (!PythonEngine.IsInitialized)
+            {
+                PythonEngine.Initialize();
+            }
+            PythonEngine.Shutdown();
+
+            var pythonHomeBackup = PythonEngine.PythonHome;
+
             var pythonHome = "/dummypath/";
 
             PythonEngine.PythonHome = "/dummypath2/";
@@ -129,18 +153,29 @@ public void SetPythonHomeTwice()
 
             Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
             PythonEngine.Shutdown();
+
+            PythonEngine.PythonHome = pythonHomeBackup;
         }
 
         [Test]
         public void SetProgramName()
         {
+            if (PythonEngine.IsInitialized)
+            {
+                PythonEngine.Shutdown();
+            }
+
+            var programNameBackup = PythonEngine.ProgramName;
+
             var programName = "FooBar";
 
             PythonEngine.ProgramName = programName;
             PythonEngine.Initialize();
 
             Assert.AreEqual(programName, PythonEngine.ProgramName);
             PythonEngine.Shutdown();
+
+            PythonEngine.ProgramName = programNameBackup;
         }
 
         [Test]
@@ -156,7 +191,7 @@ public void SetPythonPath()
             string path = PythonEngine.PythonPath;
             PythonEngine.Shutdown();
 
-            PythonEngine.ProgramName = path;
+            PythonEngine.PythonPath = path;
             PythonEngine.Initialize();
 
             Assert.AreEqual(path, PythonEngine.PythonPath);
@@ -171,7 +206,6 @@ public void SetPythonPathExceptionOn27()
                 Assert.Pass();
             }
 
-            // Get previous path to avoid crashing Python
             PythonEngine.Initialize();
             string path = PythonEngine.PythonPath;
             PythonEngine.Shutdown();
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -309,19 +309,14 @@ public static void Shutdown()
         {
             if (initialized)
             {
+                PyScopeManager.Global.Clear();
+                
                 // If the shutdown handlers trigger a domain unload,
                 // don't call shutdown again.
                 AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;
 
                 ExecuteShutdownHandlers();
 
-                Marshal.FreeHGlobal(_pythonHome);
-                _pythonHome = IntPtr.Zero;
-                Marshal.FreeHGlobal(_programName);
-                _programName = IntPtr.Zero;
-                Marshal.FreeHGlobal(_pythonPath);
-                _pythonPath = IntPtr.Zero;
-
                 initialized = false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -309,19 +309,14 @@ public static void Shutdown()`
`309`	`309`	`{`
`310`	`310`	`if (initialized)`
`311`	`311`	`{`
	`312`	`+ PyScopeManager.Global.Clear();`
	`313`	`+`
`312`	`314`	`// If the shutdown handlers trigger a domain unload,`
`313`	`315`	`// don't call shutdown again.`
`314`	`316`	`AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;`
`315`	`317`
`316`	`318`	`ExecuteShutdownHandlers();`
`317`	`319`
`318`		`- Marshal.FreeHGlobal(_pythonHome);`
`319`		`- _pythonHome = IntPtr.Zero;`
`320`		`- Marshal.FreeHGlobal(_programName);`
`321`		`- _programName = IntPtr.Zero;`
`322`		`- Marshal.FreeHGlobal(_pythonPath);`
`323`		`- _pythonPath = IntPtr.Zero;`
`324`		`-`
`325`	`320`	`initialized = false;`
`326`	`321`	`}`
`327`	`322`	`}`