@@ -20,7 +20,7 @@ public void SetUp()
             }
             catch (ArgumentNullException)
             {
-                _PYTHONMALLOC = string.Empty;
+                _PYTHONMALLOC = null;
             }
             Environment.SetEnvironmentVariable("PYTHONMALLOC", "malloc");
             _oldThreshold = Finalizer.Instance.Threshold;
@@ -33,16 +33,12 @@ public void TearDown()
         {
             Finalizer.Instance.Threshold = _oldThreshold;
             PythonEngine.Shutdown();
-            if (string.IsNullOrEmpty(_PYTHONMALLOC))
-            {
-                Environment.SetEnvironmentVariable("PYTHONMALLOC", _PYTHONMALLOC);
-            }
+            Environment.SetEnvironmentVariable("PYTHONMALLOC", _PYTHONMALLOC);
         }
 
         private static void FullGCCollect()
         {
             GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced);
-            GC.WaitForFullGCComplete();
             GC.WaitForPendingFinalizers();
         }
Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ public void SetUp()
20	20	}
21	21	catch (ArgumentNullException)
22	22	{
23		- _PYTHONMALLOC = string.Empty;
	23	+ _PYTHONMALLOC = null;
24	24	}
25	25	Environment.SetEnvironmentVariable("PYTHONMALLOC", "malloc");
26	26	_oldThreshold = Finalizer.Instance.Threshold;
@@ -33,16 +33,12 @@ public void TearDown()
33	33	{
34	34	Finalizer.Instance.Threshold = _oldThreshold;
35	35	PythonEngine.Shutdown();
36		- if (string.IsNullOrEmpty(_PYTHONMALLOC))
37		- {
38		- Environment.SetEnvironmentVariable("PYTHONMALLOC", _PYTHONMALLOC);
39		- }
	36	+ Environment.SetEnvironmentVariable("PYTHONMALLOC", _PYTHONMALLOC);
40	37	}
41	38
42	39	private static void FullGCCollect()
43	40	{
44	41	GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced);
45		- GC.WaitForFullGCComplete();
46	42	GC.WaitForPendingFinalizers();
47	43	}
48	44