Fix sandbox killing in all tests

Author: ValentaTomas

js/tests/envVars.test.ts

@@ -8,11 +8,16 @@ sandboxTest.skipIf(isDebug)('env vars', async () => {
   const sandbox = await Sandbox.create({
     envs: { TEST_ENV_VAR: 'supertest' },
   })
-  const result = await sandbox.runCode(
-    `import os; x = os.getenv('TEST_ENV_VAR'); x`
-  )
 
-  expect(result.results[0].text.trim()).toEqual('supertest')
+  try {
+    const result = await sandbox.runCode(
+      `import os; x = os.getenv('TEST_ENV_VAR'); x`
+    )
+
+    expect(result.results[0].text.trim()).toEqual('supertest')
+  } finally {
+    await sandbox.kill()
+  }
 })
 
 sandboxTest('env vars on sandbox', async ({ sandbox }) => {
@@ -28,28 +33,33 @@ sandboxTest('env vars on sandbox override', async () => {
   const sandbox = await Sandbox.create({
     envs: { FOO: 'bar', SBX: 'value' },
   })
-  await sandbox.runCode(
-    "import os; os.environ['FOO'] = 'bar'; os.environ['RUNTIME_ENV'] = 'js_runtime'"
-  )
-  const result = await sandbox.runCode(
-    "import os; os.getenv('FOO')",
-    { envs: { FOO: 'baz' } }
-  )
 
-  expect(result.results[0].text.trim()).toEqual('baz')
+  try {
+    await sandbox.runCode(
+      "import os; os.environ['FOO'] = 'bar'; os.environ['RUNTIME_ENV'] = 'js_runtime'"
+    )
+    const result = await sandbox.runCode(
+      "import os; os.getenv('FOO')",
+      { envs: { FOO: 'baz' } }
+    )
 
-  const result2 = await sandbox.runCode(
-    "import os; os.getenv('RUNTIME_ENV')"
-  )
-  expect(result2.results[0].text.trim()).toEqual('js_runtime')
+    expect(result.results[0].text.trim()).toEqual('baz')
 
-  if (!isDebug) {
-    const result3 = await sandbox.runCode(
-      "import os; os.getenv('SBX')"
+    const result2 = await sandbox.runCode(
+      "import os; os.getenv('RUNTIME_ENV')"
     )
-    expect(result3.results[0].text.trim()).toEqual('value')
-  }
+    expect(result2.results[0].text.trim()).toEqual('js_runtime')
+
+    if (!isDebug) {
+      const result3 = await sandbox.runCode(
+        "import os; os.getenv('SBX')"
+      )
+      expect(result3.results[0].text.trim()).toEqual('value')
+    }
 
-  const result4 = await sandbox.runCode("import os; os.getenv('FOO')")
-  expect(result4.results[0].text.trim()).toEqual('bar')
+    const result4 = await sandbox.runCode("import os; os.getenv('FOO')")
+    expect(result4.results[0].text.trim()).toEqual('bar')
+  } finally {
+    await sandbox.kill()
+  }
 })

js/tests/runtimes/bun/run.test.ts

@@ -4,6 +4,7 @@ import { Sandbox } from '../../../src'
 
 test('Bun test', async () => {
   const sbx = await Sandbox.create({ timeoutMs: 5_000 })
+
   try {
     const result = await sbx.runCode('print("Hello, World!")')
     expect(result.logs.stdout.join('')).toEqual('Hello, World!\n')

js/tests/runtimes/deno/run.test.ts

@@ -7,6 +7,7 @@ import { Sandbox } from '../../../dist/index.mjs'
 
 Deno.test('Deno test', async () => {
   const sbx = await Sandbox.create({ timeoutMs: 5_000 })
+
   try {
     const result = await sbx.runCode('print("Hello, World!")')
     assertEquals(result.logs.stdout.join(''), 'Hello, World!\n')

python/tests/async/test_async_env_vars.py

@@ -6,9 +6,11 @@
 @pytest.mark.skip_debug()
 async def test_env_vars_sandbox():
     sbx = await AsyncSandbox.create(envs={"FOO": "bar"})
-    result = await sbx.run_code("import os; os.getenv('FOO')")
-    assert result.text == "bar"
-    await sbx.kill()
+    try:
+        result = await sbx.run_code("import os; os.getenv('FOO')")
+        assert result.text == "bar"
+    finally:
+        await sbx.kill()
 
 
 async def test_env_vars_in_run_code(async_sandbox: AsyncSandbox):
@@ -20,22 +22,24 @@ async def test_env_vars_in_run_code(async_sandbox: AsyncSandbox):
 
 async def test_env_vars_override(debug: bool):
     sbx = await AsyncSandbox.create(envs={"FOO": "bar", "SBX": "value"})
-    await sbx.run_code(
-        "import os; os.environ['FOO'] = 'bar'; os.environ['RUNTIME_ENV'] = 'async_python_runtime'"
-    )
-    result = await sbx.run_code("import os; os.getenv('FOO')", envs={"FOO": "baz"})
-    assert result.text == "baz"
-
-    # This can fail if running in debug mode (there's a race condition with the restart kernel test)
-    result = await sbx.run_code("import os; os.getenv('RUNTIME_ENV')")
-    assert result.text == "async_python_runtime"
-
-    if not debug:
-        result = await sbx.run_code("import os; os.getenv('SBX')")
-        assert result.text == "value"
-
-    # This can fail if running in debug mode (there's a race condition with the restart kernel test)
-    result = await sbx.run_code("import os; os.getenv('FOO')")
-    assert result.text == "bar"
 
-    await sbx.kill()
+    try:
+        await sbx.run_code(
+            "import os; os.environ['FOO'] = 'bar'; os.environ['RUNTIME_ENV'] = 'async_python_runtime'"
+        )
+        result = await sbx.run_code("import os; os.getenv('FOO')", envs={"FOO": "baz"})
+        assert result.text == "baz"
+
+        # This can fail if running in debug mode (there's a race condition with the restart kernel test)
+        result = await sbx.run_code("import os; os.getenv('RUNTIME_ENV')")
+        assert result.text == "async_python_runtime"
+
+        if not debug:
+            result = await sbx.run_code("import os; os.getenv('SBX')")
+            assert result.text == "value"
+
+        # This can fail if running in debug mode (there's a race condition with the restart kernel test)
+        result = await sbx.run_code("import os; os.getenv('FOO')")
+        assert result.text == "bar"
+    finally:
+        await sbx.kill()