Close engines instead of letting them leak

timfel · timfel · commit 30ff594c1772 · 2025-06-26T13:08:09.000+02:00
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/EngineOptionsTests.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/EngineOptionsTests.java
@@ -58,6 +58,7 @@ public void engineOptions() {
         assertEquals("java", doit(engine, null));
         assertEquals("java", doit(engine, "java"));
         assertEquals("native", doit(engine, "native"));
+        engine.close();
     }
 
     private static String doit(Engine engine, String backend) {
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/MultiContextTest.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/MultiContextTest.java
@@ -55,6 +55,7 @@ public void testSharingWithMemoryview() {
                 context.eval("python", "memoryview(b'abc')");
             }
         }
+        engine.close();
     }
 
     @Test
@@ -72,6 +73,7 @@ public void testTryCatch() {
                                 "last_val");
             }
         }
+        engine.close();
     }
 
     private static Context newContext(Engine engine) {
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/NativeExtTest.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/NativeExtTest.java
@@ -104,6 +104,7 @@ public void testSharingErrorWithCpythonSre() throws InterruptedException {
 
         } finally {
             cextContext.close(true);
+            engine.close();
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/ResourcesTest.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/ResourcesTest.java
@@ -73,7 +73,7 @@ public void testResourcesAsHome() {
 
     @Test
     public void testResourcesAlwaysAllowReading() {
-        try (Context context = Context.newBuilder("python").engine(Engine.create("python")).allowIO(IOAccess.NONE).option("python.PythonHome", "/path/that/does/not/exist").build()) {
+        try (Engine engine = Engine.create("python"); Context context = Context.newBuilder("python").engine(engine).allowIO(IOAccess.NONE).option("python.PythonHome", "/path/that/does/not/exist").build()) {
             String foundHome = context.eval("python", "import email; email.__spec__.origin").asString();
             assertTrue(foundHome, foundHome.contains("python" + File.separator + "python-home"));
         }
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/ArgumentsTest.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/ArgumentsTest.java
@@ -81,6 +81,7 @@ public void setUpTest() {
     @After
     public void tearDown() {
         context.close();
+        context.getEngine().close();
     }
 
     public interface TestPositionalArgsLong {
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/JavaInteropTest.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/JavaInteropTest.java
@@ -104,6 +104,7 @@ public void setUpTest() {
         @After
         public void tearDown() {
             context.close();
+            context.getEngine().close();
         }
 
         @Test
@@ -119,7 +120,7 @@ public void evalFailsOnError() {
 
         @Test
         public void evalNonInteractiveThrowsSyntaxError() throws IOException {
-            try (Context c = Context.newBuilder().engine(Engine.create("python")).allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
+            try (Engine engine = Engine.create("python"); Context c = Context.newBuilder().engine(engine).allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
                 c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(false).build());
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
@@ -131,7 +132,7 @@ public void evalNonInteractiveThrowsSyntaxError() throws IOException {
 
         @Test
         public void evalNonInteractiveInInteractiveTerminalThrowsSyntaxError() throws IOException {
-            try (Context c = Context.newBuilder().engine(Engine.create("python")).allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
+            try (Engine engine = Engine.create("python"); Context c = Context.newBuilder().engine(engine).allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
                 c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(false).build());
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
@@ -143,7 +144,7 @@ public void evalNonInteractiveInInteractiveTerminalThrowsSyntaxError() throws IO
 
         @Test
         public void evalInteractiveInNonInteractiveTerminalThrowsSyntaxError() throws IOException {
-            try (Context c = Context.newBuilder().engine(Engine.create("python")).allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
+            try (Engine engine = Engine.create("python"); Context c = Context.newBuilder().engine(engine).allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
                 c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(true).build());
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
@@ -155,7 +156,7 @@ public void evalInteractiveInNonInteractiveTerminalThrowsSyntaxError() throws IO
 
         @Test
         public void evalInteractiveInInteractiveTerminalThrowsSyntaxError() throws IOException {
-            try (Context c = Context.newBuilder().engine(Engine.create("python")).allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
+            try (Engine engine = Engine.create("python"); Context c = Context.newBuilder().engine(engine).allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
                 c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(true).build());
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
@@ -168,7 +169,7 @@ public void evalInteractiveInInteractiveTerminalThrowsSyntaxError() throws IOExc
 
         @Test
         public void importingJavaLangStringConvertsEagerly() {
-            try (Context c = Context.newBuilder().engine(Engine.create("python")).allowExperimentalOptions(true).allowAllAccess(true).build()) {
+            try (Engine engine = Engine.create("python"); Context c = Context.newBuilder().engine(engine).allowExperimentalOptions(true).allowAllAccess(true).build()) {
                 c.getPolyglotBindings().putMember("b", "hello world");
                 c.eval("python", "import polyglot; xyz = polyglot.import_value('b'); assert isinstance(xyz, str)");
                 // should not fail
@@ -177,7 +178,7 @@ public void importingJavaLangStringConvertsEagerly() {
 
         @Test
         public void evalWithSyntaxErrorThrows() {
-            try (Context c = Context.newBuilder().engine(Engine.create("python")).build()) {
+            try (Engine engine = Engine.create("python"); Context c = Context.newBuilder().engine(engine).build()) {
                 c.eval("python", "var d=5/0");
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/TimeDateTest.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/TimeDateTest.java
@@ -82,6 +82,7 @@ public void setUpTest() {
     @After
     public void tearDown() {
         context.close();
+        context.getEngine().close();
     }
 
     @Test
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/module/LocaleTest.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/module/LocaleTest.java
@@ -82,7 +82,7 @@ public void localeconvWithJvmLocale() {
     @Test
     public void getlocaleWithOption() {
         String expectedEncoding = Charset.defaultCharset().displayName();
-        try (Context context = Context.newBuilder("python").engine(Engine.create("python")).option("python.InitialLocale", "en_GB").build()) {
+        try (Engine engine = Engine.create("python"); Context context = Context.newBuilder("python").engine(engine).option("python.InitialLocale", "en_GB").build()) {
             Value tuple = context.eval("python", "import locale; locale.getlocale()");
             assertEquals("en_GB", tuple.getArrayElement(0).asString());
             assertEquals(expectedEncoding, tuple.getArrayElement(1).asString());
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/module/LzmaTests.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/module/LzmaTests.java
@@ -61,7 +61,7 @@ public static boolean[] params() {
 
     @Test
     public void testLzmaBasics() {
-        try (Context context = Context.newBuilder("python").engine(Engine.create("python")).allowNativeAccess(useNative).build()) {
+        try (Engine engine = Engine.create("python"); Context context = Context.newBuilder("python").engine(engine).allowNativeAccess(useNative).build()) {
             Value isSupported = context.eval("python", "import lzma; lzma.is_check_supported(lzma.CHECK_CRC32)");
             assertTrue(isSupported.isBoolean());
             assertTrue(isSupported.asBoolean());
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/module/MemoryviewTest.java b/graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/module/MemoryviewTest.java
@@ -49,9 +49,10 @@
 public class MemoryviewTest extends PythonTests {
     @Test
     public void testContextReuse() {
-        Engine engine = Engine.create("python");
-        try (Context context = newContext(engine)) {
-            context.eval("python", "memoryview(b'abc')");
+        try (Engine engine = Engine.create("python")) {
+            try (Context context = newContext(engine)) {
+                context.eval("python", "memoryview(b'abc')");
+            }
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/test/integration/GraalPyResourcesTests.java b/graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/test/integration/GraalPyResourcesTests.java
@@ -57,5 +57,6 @@ public void sharedEngine() {
         GraalPyResources.contextBuilder().engine(sharedEngine).build().close();
         GraalPyResources.contextBuilder(Path.of("test")).engine(sharedEngine).build().close();
         GraalPyResources.contextBuilder(VirtualFileSystem.newBuilder().build()).engine(sharedEngine).build().close();
+        sharedEngine.close();
     }
 }
diff --git a/graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/test/integration/VirtualFileSystemIntegrationTest.java b/graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/test/integration/VirtualFileSystemIntegrationTest.java
@@ -76,8 +76,10 @@
 import org.graalvm.polyglot.io.IOAccess;
 import org.graalvm.python.embedding.GraalPyResources;
 import org.graalvm.python.embedding.VirtualFileSystem;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Assume;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -122,11 +124,23 @@ private VirtualFileSystem createVirtualFileSystem() {
         return VirtualFileSystem.newBuilder().resourceDirectory(resourceDirectory).build();
     }
 
+    private static Engine engine;
+    
+    @BeforeClass
+    public static void makeEngine() {
+        engine = Engine.create("python");
+    }
+
+    @AfterClass
+    public static void closeEngine() {
+        engine.close();
+    }
+
     private Context.Builder newContextBuilder() {
         if (useDefaultResourcesDir()) {
-            return GraalPyResources.contextBuilder().engine(Engine.create("python"));
+            return GraalPyResources.contextBuilder().engine(engine);
         }
-        return GraalPyResources.contextBuilder(createVirtualFileSystem()).engine(Engine.create("python"));
+        return GraalPyResources.contextBuilder(createVirtualFileSystem()).engine(engine);
     }
 
     private VirtualFileSystem.Builder newVirtualFileSystemBuilder() {

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ public void engineOptions() {`
`58`	`58`	`assertEquals("java", doit(engine, null));`
`59`	`59`	`assertEquals("java", doit(engine, "java"));`
`60`	`60`	`assertEquals("native", doit(engine, "native"));`
	`61`	`+ engine.close();`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`private static String doit(Engine engine, String backend) {`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public void testSharingWithMemoryview() {`
`55`	`55`	`context.eval("python", "memoryview(b'abc')");`
`56`	`56`	`}`
`57`	`57`	`}`
	`58`	`+ engine.close();`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`@Test`
`@@ -72,6 +73,7 @@ public void testTryCatch() {`
`72`	`73`	`"last_val");`
`73`	`74`	`}`
`74`	`75`	`}`
	`76`	`+ engine.close();`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`private static Context newContext(Engine engine) {`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ public void testSharingErrorWithCpythonSre() throws InterruptedException {`
`104`	`104`
`105`	`105`	`} finally {`
`106`	`106`	`cextContext.close(true);`
	`107`	`+ engine.close();`
`107`	`108`	`}`
`108`	`109`	`}`
`109`	`110`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public void testResourcesAsHome() {`
`73`	`73`
`74`	`74`	`@Test`
`75`	`75`	`public void testResourcesAlwaysAllowReading() {`
`76`		`- try (Context context = Context.newBuilder("python").engine(Engine.create("python")).allowIO(IOAccess.NONE).option("python.PythonHome", "/path/that/does/not/exist").build()) {`
	`76`	`+ try (Engine engine = Engine.create("python"); Context context = Context.newBuilder("python").engine(engine).allowIO(IOAccess.NONE).option("python.PythonHome", "/path/that/does/not/exist").build()) {`
`77`	`77`	`String foundHome = context.eval("python", "import email; email.__spec__.origin").asString();`
`78`	`78`	`assertTrue(foundHome, foundHome.contains("python" + File.separator + "python-home"));`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ public void setUpTest() {`
`81`	`81`	`@After`
`82`	`82`	`public void tearDown() {`
`83`	`83`	`context.close();`
	`84`	`+ context.getEngine().close();`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`public interface TestPositionalArgsLong {`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public void setUpTest() {`
`82`	`82`	`@After`
`83`	`83`	`public void tearDown() {`
`84`	`84`	`context.close();`
	`85`	`+ context.getEngine().close();`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,10 @@`
`49`	`49`	`public class MemoryviewTest extends PythonTests {`
`50`	`50`	`@Test`
`51`	`51`	`public void testContextReuse() {`
`52`		`- Engine engine = Engine.create("python");`
`53`		`- try (Context context = newContext(engine)) {`
`54`		`- context.eval("python", "memoryview(b'abc')");`
	`52`	`+ try (Engine engine = Engine.create("python")) {`
	`53`	`+ try (Context context = newContext(engine)) {`
	`54`	`+ context.eval("python", "memoryview(b'abc')");`
	`55`	`+ }`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`