Remove shutdown from most tests, disable the rest for now

filmor · filmor · commit e7b51d770d6e · 2025-12-08T11:00:10.000+01:00
diff --git a/src/embed_tests/Events.cs b/src/embed_tests/Events.cs
@@ -10,18 +10,6 @@ namespace Python.EmbeddingTest;
 
 public class Events
 {
-    [OneTimeSetUp]
-    public void SetUp()
-    {
-        PythonEngine.Initialize();
-    }
-
-    [OneTimeTearDown]
-    public void Dispose()
-    {
-        PythonEngine.Shutdown();
-    }
-
     [Test]
     public void UsingDoesNotLeak()
     {
diff --git a/src/embed_tests/Modules.cs b/src/embed_tests/Modules.cs
@@ -28,18 +28,6 @@ public void Dispose()
             }
         }
 
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void OneTimeTearDown()
-        {
-            PythonEngine.Shutdown();
-        }
-
         /// <summary>
         /// Eval a Python expression and obtain its return value.
         /// </summary>
diff --git a/src/embed_tests/StateSerialization/MethodSerialization.cs b/src/embed_tests/StateSerialization/MethodSerialization.cs
@@ -20,7 +20,7 @@ public void GenericRoundtrip()
     }
 
     [Test]
-    public void ConstrctorRoundtrip()
+    public void ConstructorRoundtrip()
     {
         var ctor = typeof(MethodTestHost).GetConstructor(new[] { typeof(int) });
         var maybeConstructor = new MaybeMethodBase<MethodBase>(ctor);
@@ -33,6 +33,10 @@ static T SerializationRoundtrip<T>(T item)
     {
         using var buf = new MemoryStream();
         var formatter = RuntimeData.CreateFormatter();
+        if (typeof(NoopFormatter).IsAssignableFrom(formatter.GetType()))
+        {
+            Assert.Inconclusive("NoopFormatter in use, cannot perform serialization test.");
+        }
         formatter.Serialize(buf, item);
         buf.Position = 0;
         return (T)formatter.Deserialize(buf);
diff --git a/src/embed_tests/TestFinalizer.cs b/src/embed_tests/TestFinalizer.cs
@@ -86,6 +86,7 @@ public void CollectBasicObject()
         }
 
         [Test]
+        [Ignore("Requires explicit shutdown")]
         [Obsolete("GC tests are not guaranteed")]
         public void CollectOnShutdown()
         {
diff --git a/src/embed_tests/TestPyInt.cs b/src/embed_tests/TestPyInt.cs
@@ -10,18 +10,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPyInt
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void TestCtorInt()
         {
diff --git a/src/embed_tests/TestPyIter.cs b/src/embed_tests/TestPyIter.cs
@@ -9,18 +9,6 @@ namespace Python.EmbeddingTest
 {
     class TestPyIter
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void KeepOldObjects()
         {
diff --git a/src/embed_tests/TestPyList.cs b/src/embed_tests/TestPyList.cs
@@ -7,18 +7,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPyList
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void TestStringIsListType()
         {
diff --git a/src/embed_tests/TestPyNumber.cs b/src/embed_tests/TestPyNumber.cs
@@ -6,18 +6,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPyNumber
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void IsNumberTypeTrue()
         {
diff --git a/src/embed_tests/TestPyObject.cs b/src/embed_tests/TestPyObject.cs
@@ -8,18 +8,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPyObject
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void TestGetDynamicMemberNames()
         {
diff --git a/src/embed_tests/TestPySequence.cs b/src/embed_tests/TestPySequence.cs
@@ -6,18 +6,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPySequence
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void TestIsSequenceTrue()
         {
diff --git a/src/embed_tests/TestPyString.cs b/src/embed_tests/TestPyString.cs
@@ -6,18 +6,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPyString
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void TestStringCtor()
         {
diff --git a/src/embed_tests/TestPyTuple.cs b/src/embed_tests/TestPyTuple.cs
@@ -6,18 +6,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPyTuple
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         /// <summary>
         /// Test IsTupleType without having to Initialize a tuple.
         /// PyTuple constructor use IsTupleType. This decouples the tests.
diff --git a/src/embed_tests/TestPyType.cs b/src/embed_tests/TestPyType.cs
@@ -10,18 +10,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPyType
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void CanCreateHeapType()
         {
diff --git a/src/embed_tests/TestPyWith.cs b/src/embed_tests/TestPyWith.cs
@@ -6,18 +6,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPyWith
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         /// <summary>
         /// Test that exception is raised in context manager that ignores it.
         /// </summary>
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -9,7 +9,6 @@ public class TestPythonEngineProperties
         [Test]
         public static void GetBuildinfoDoesntCrash()
         {
-            PythonEngine.Initialize();
             using (Py.GIL())
             {
                 string s = PythonEngine.BuildInfo;
@@ -22,7 +21,6 @@ public static void GetBuildinfoDoesntCrash()
         [Test]
         public static void GetCompilerDoesntCrash()
         {
-            PythonEngine.Initialize();
             using (Py.GIL())
             {
                 string s = PythonEngine.Compiler;
@@ -36,7 +34,6 @@ public static void GetCompilerDoesntCrash()
         [Test]
         public static void GetCopyrightDoesntCrash()
         {
-            PythonEngine.Initialize();
             using (Py.GIL())
             {
                 string s = PythonEngine.Copyright;
@@ -49,7 +46,6 @@ public static void GetCopyrightDoesntCrash()
         [Test]
         public static void GetPlatformDoesntCrash()
         {
-            PythonEngine.Initialize();
             using (Py.GIL())
             {
                 string s = PythonEngine.Platform;
@@ -62,7 +58,6 @@ public static void GetPlatformDoesntCrash()
         [Test]
         public static void GetVersionDoesntCrash()
         {
-            PythonEngine.Initialize();
             using (Py.GIL())
             {
                 string s = PythonEngine.Version;
@@ -75,21 +70,17 @@ public static void GetVersionDoesntCrash()
         [Test]
         public static void GetPythonPathDefault()
         {
-            PythonEngine.Initialize();
             string s = PythonEngine.PythonPath;
 
             StringAssert.Contains("python", s.ToLower());
-            PythonEngine.Shutdown();
         }
 
         [Test]
         public static void GetProgramNameDefault()
         {
-            PythonEngine.Initialize();
             string s = PythonEngine.ProgramName;
 
             Assert.NotNull(s);
-            PythonEngine.Shutdown();
         }
 
         /// <summary>
@@ -101,13 +92,12 @@ public static void GetPythonHomeDefault()
         {
             string envPythonHome = Environment.GetEnvironmentVariable("PYTHONHOME") ?? "";
 
-            PythonEngine.Initialize();
             string enginePythonHome = PythonEngine.PythonHome;
 
             Assert.AreEqual(envPythonHome, enginePythonHome);
-            PythonEngine.Shutdown();
         }
 
+        [Ignore("Only works if we can shutdown and re-init the interpreter")]
         [Test]
         public void SetPythonHome()
         {
@@ -130,6 +120,7 @@ public void SetPythonHome()
             PythonEngine.PythonHome = pythonHomeBackup;
         }
 
+        [Ignore("Only works if we can shutdown and re-init the interpreter")]
         [Test]
         public void SetPythonHomeTwice()
         {
@@ -172,6 +163,7 @@ public void SetPythonHomeEmptyString()
             PythonEngine.Shutdown();
         }
 
+        [Ignore("Only works if we can shutdown and re-init the interpreter")]
         [Test]
         public void SetProgramName()
         {
@@ -193,6 +185,7 @@ public void SetProgramName()
             PythonEngine.ProgramName = programNameBackup;
         }
 
+        [Ignore("Only works if we can shutdown and re-init the interpreter")]
         [Test]
         public void SetPythonPath()
         {
diff --git a/src/embed_tests/TestPythonException.cs b/src/embed_tests/TestPythonException.cs
@@ -6,18 +6,6 @@ namespace Python.EmbeddingTest
 {
     public class TestPythonException
     {
-        [OneTimeSetUp]
-        public void SetUp()
-        {
-            PythonEngine.Initialize();
-        }
-
-        [OneTimeTearDown]
-        public void Dispose()
-        {
-            PythonEngine.Shutdown();
-        }
-
         [Test]
         public void TestMessage()
         {
diff --git a/src/embed_tests/TestRuntime.cs b/src/embed_tests/TestRuntime.cs
@@ -5,6 +5,7 @@
 
 namespace Python.EmbeddingTest
 {
+    [Ignore("Only works if we can shutdown and re-initialize the Python runtime")]
     public class TestRuntime
     {
         [OneTimeSetUp]
diff --git a/src/embed_tests/pyimport.cs b/src/embed_tests/pyimport.cs
@@ -42,7 +42,8 @@ public void SetUp()
         [OneTimeTearDown]
         public void Dispose()
         {
-            // TODO Undo the above
+            using var _ = Py.GIL();
+            Py.Import("sys").GetAttr("path").InvokeMethod("remove", new PyString(TestPath));
         }
 
         /// <summary>
diff --git a/src/embed_tests/pyinitialize.cs b/src/embed_tests/pyinitialize.cs

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public void GenericRoundtrip()`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[Test]`
`23`		`- public void ConstrctorRoundtrip()`
	`23`	`+ public void ConstructorRoundtrip()`
`24`	`24`	`{`
`25`	`25`	`var ctor = typeof(MethodTestHost).GetConstructor(new[] { typeof(int) });`
`26`	`26`	`var maybeConstructor = new MaybeMethodBase<MethodBase>(ctor);`
`@@ -33,6 +33,10 @@ static T SerializationRoundtrip<T>(T item)`
`33`	`33`	`{`
`34`	`34`	`using var buf = new MemoryStream();`
`35`	`35`	`var formatter = RuntimeData.CreateFormatter();`
	`36`	`+ if (typeof(NoopFormatter).IsAssignableFrom(formatter.GetType()))`
	`37`	`+ {`
	`38`	`+ Assert.Inconclusive("NoopFormatter in use, cannot perform serialization test.");`
	`39`	`+ }`
`36`	`40`	`formatter.Serialize(buf, item);`
`37`	`41`	`buf.Position = 0;`
`38`	`42`	`return (T)formatter.Deserialize(buf);`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ public void CollectBasicObject()`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`[Test]`
	`89`	`+ [Ignore("Requires explicit shutdown")]`
`89`	`90`	`[Obsolete("GC tests are not guaranteed")]`
`90`	`91`	`public void CollectOnShutdown()`
`91`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,18 +10,6 @@ namespace Python.EmbeddingTest`
`10`	`10`	`{`
`11`	`11`	`public class TestPyInt`
`12`	`12`	`{`
`13`		`- [OneTimeSetUp]`
`14`		`- public void SetUp()`
`15`		`- {`
`16`		`- PythonEngine.Initialize();`
`17`		`- }`
`18`		`-`
`19`		`- [OneTimeTearDown]`
`20`		`- public void Dispose()`
`21`		`- {`
`22`		`- PythonEngine.Shutdown();`
`23`		`- }`
`24`		`-`
`25`	`13`	`[Test]`
`26`	`14`	`public void TestCtorInt()`
`27`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,6 @@ namespace Python.EmbeddingTest`
`9`	`9`	`{`
`10`	`10`	`class TestPyIter`
`11`	`11`	`{`
`12`		`- [OneTimeSetUp]`
`13`		`- public void SetUp()`
`14`		`- {`
`15`		`- PythonEngine.Initialize();`
`16`		`- }`
`17`		`-`
`18`		`- [OneTimeTearDown]`
`19`		`- public void Dispose()`
`20`		`- {`
`21`		`- PythonEngine.Shutdown();`
`22`		`- }`
`23`		`-`
`24`	`12`	`[Test]`
`25`	`13`	`public void KeepOldObjects()`
`26`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,6 @@ namespace Python.EmbeddingTest`
`7`	`7`	`{`
`8`	`8`	`public class TestPyList`
`9`	`9`	`{`
`10`		`- [OneTimeSetUp]`
`11`		`- public void SetUp()`
`12`		`- {`
`13`		`- PythonEngine.Initialize();`
`14`		`- }`
`15`		`-`
`16`		`- [OneTimeTearDown]`
`17`		`- public void Dispose()`
`18`		`- {`
`19`		`- PythonEngine.Shutdown();`
`20`		`- }`
`21`		`-`
`22`	`10`	`[Test]`
`23`	`11`	`public void TestStringIsListType()`
`24`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,6 @@ namespace Python.EmbeddingTest`
`6`	`6`	`{`
`7`	`7`	`public class TestPyNumber`
`8`	`8`	`{`
`9`		`- [OneTimeSetUp]`
`10`		`- public void SetUp()`
`11`		`- {`
`12`		`- PythonEngine.Initialize();`
`13`		`- }`
`14`		`-`
`15`		`- [OneTimeTearDown]`
`16`		`- public void Dispose()`
`17`		`- {`
`18`		`- PythonEngine.Shutdown();`
`19`		`- }`
`20`		`-`
`21`	`9`	`[Test]`
`22`	`10`	`public void IsNumberTypeTrue()`
`23`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,18 +8,6 @@ namespace Python.EmbeddingTest`
`8`	`8`	`{`
`9`	`9`	`public class TestPyObject`
`10`	`10`	`{`
`11`		`- [OneTimeSetUp]`
`12`		`- public void SetUp()`
`13`		`- {`
`14`		`- PythonEngine.Initialize();`
`15`		`- }`
`16`		`-`
`17`		`- [OneTimeTearDown]`
`18`		`- public void Dispose()`
`19`		`- {`
`20`		`- PythonEngine.Shutdown();`
`21`		`- }`
`22`		`-`
`23`	`11`	`[Test]`
`24`	`12`	`public void TestGetDynamicMemberNames()`
`25`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,6 @@ namespace Python.EmbeddingTest`
`6`	`6`	`{`
`7`	`7`	`public class TestPySequence`
`8`	`8`	`{`
`9`		`- [OneTimeSetUp]`
`10`		`- public void SetUp()`
`11`		`- {`
`12`		`- PythonEngine.Initialize();`
`13`		`- }`
`14`		`-`
`15`		`- [OneTimeTearDown]`
`16`		`- public void Dispose()`
`17`		`- {`
`18`		`- PythonEngine.Shutdown();`
`19`		`- }`
`20`		`-`
`21`	`9`	`[Test]`
`22`	`10`	`public void TestIsSequenceTrue()`
`23`	`11`	`{`