update tests

Author: mishushakov

js/tests/supervisord.test.ts

@@ -19,8 +19,10 @@ sandboxTest('restart after jupyter kill', async ({ sandbox }) => {
   const initialHealth = await waitForHealth(sandbox)
   expect(initialHealth).toBe(true)
 
-  // Kill the jupyter process
-  await sandbox.commands.run('supervisorctl stop jupyter')
+  // Kill the jupyter process by pid
+  await sandbox.commands.run(
+    "kill -9 $(pgrep -f 'jupyter server')"
+  )
 
   // Wait for supervisord to restart it and health to come back
   const recovered = await waitForHealth(sandbox, 10, 100)
@@ -36,8 +38,10 @@ sandboxTest('restart after code-interpreter kill', async ({ sandbox }) => {
   const initialHealth = await waitForHealth(sandbox)
   expect(initialHealth).toBe(true)
 
-  // Kill the code-interpreter process
-  await sandbox.commands.run('supervisorctl stop code-interpreter')
+  // Kill the code-interpreter process by pid
+  await sandbox.commands.run(
+    'kill -9 $(cat /var/run/code-interpreter.pid)'
+  )
 
   // Wait for supervisord to restart it and health to come back
   const recovered = await waitForHealth(sandbox, 10, 100)

python/tests/async/test_async_supervisord.py

@@ -18,8 +18,8 @@ async def test_restart_after_jupyter_kill(async_sandbox: AsyncSandbox):
     # Verify health is up initially
     assert await wait_for_health(async_sandbox)
 
-    # Kill the jupyter process
-    await async_sandbox.commands.run("supervisorctl stop jupyter")
+    # Kill the jupyter process by pid
+    await async_sandbox.commands.run("kill -9 $(pgrep -f 'jupyter server')")
 
     # Wait for supervisord to restart it and health to come back
     assert await wait_for_health(async_sandbox, 10, 100)
@@ -33,8 +33,8 @@ async def test_restart_after_code_interpreter_kill(async_sandbox: AsyncSandbox):
     # Verify health is up initially
     assert await wait_for_health(async_sandbox)
 
-    # Kill the code-interpreter process
-    await async_sandbox.commands.run("supervisorctl stop code-interpreter")
+    # Kill the code-interpreter process by pid
+    await async_sandbox.commands.run("kill -9 $(cat /var/run/code-interpreter.pid)")
 
     # Wait for supervisord to restart it and health to come back
     assert await wait_for_health(async_sandbox, 10, 100)

python/tests/sync/test_supervisord.py

@@ -18,8 +18,8 @@ def test_restart_after_jupyter_kill(sandbox: Sandbox):
     # Verify health is up initially
     assert wait_for_health(sandbox)
 
-    # Kill the jupyter process
-    sandbox.commands.run("supervisorctl stop jupyter")
+    # Kill the jupyter process by pid
+    sandbox.commands.run("kill -9 $(pgrep -f 'jupyter server')")
 
     # Wait for supervisord to restart it and health to come back
     assert wait_for_health(sandbox, 10, 100)
@@ -33,8 +33,8 @@ def test_restart_after_code_interpreter_kill(sandbox: Sandbox):
     # Verify health is up initially
     assert wait_for_health(sandbox)
 
-    # Kill the code-interpreter process
-    sandbox.commands.run("supervisorctl stop code-interpreter")
+    # Kill the code-interpreter process by pid
+    sandbox.commands.run("kill -9 $(cat /var/run/code-interpreter.pid)")
 
     # Wait for supervisord to restart it and health to come back
     assert wait_for_health(sandbox, 10, 100)