Skip to content

Commit 45a18e0

Browse files
mishushakovmishushakov
committed
updated tests (bash mostly)
1 parent 1845152 commit 45a18e0

File tree

8 files changed

+116
-147
lines changed

8 files changed

+116
-147
lines changed

‎js/tests/env_vars/bash.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sandboxTest.skipIf(isDebug)('env vars on sandbox (bash)', async () => {
1717
}
1818
)
1919

20-
expect(result.results[0]?.text.trim()).toEqual('supertest')
20+
expect(result.logs.stdout[0]).toEqual('supertest\n')
2121
} finally {
2222
await sandbox.kill()
2323
}
@@ -36,8 +36,8 @@ sandboxTest('env vars per execution (bash)', async ({ sandbox }) => {
3636
}
3737
)
3838

39-
expect(result.results[0]?.text.trim()).toEqual('bar')
40-
expect(result_empty.results[0]?.text.trim()).toEqual('default')
39+
expect(result.logs.stdout[0]).toEqual('bar\n')
40+
expect(result_empty.logs.stdout[0]).toEqual('default\n')
4141
})
4242

4343
sandboxTest.skipIf(isDebug)('env vars overwrite', async () => {
@@ -54,7 +54,7 @@ sandboxTest.skipIf(isDebug)('env vars overwrite', async () => {
5454
}
5555
)
5656

57-
expect(result.results[0]?.text.trim()).toEqual('overwrite')
57+
expect(result.logs.stdout[0]).toEqual('overwrite\n')
5858
} finally {
5959
await sandbox.kill()
6060
}

‎python/tests/async/env_vars/test_bash.py‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import pytest
22
from e2b_code_interpreter.code_interpreter_async import AsyncSandbox
3+
from typing import AsyncGenerator
34

45
@pytest.mark.skip_debug()
56
async def test_env_vars_on_sandbox():
@@ -9,31 +10,24 @@ async def test_env_vars_on_sandbox():
910
"echo $TEST_ENV_VAR",
1011
language="bash"
1112
)
12-
assert result.text is not None
13-
assert result.text.strip() == "supertest"
13+
assert result.logs.stdout[0] == "supertest\n"
1414
finally:
1515
await sandbox.kill()
1616

17-
async def test_env_vars_per_execution():
18-
sandbox = await AsyncSandbox.create()
19-
try:
20-
result = await sandbox.run_code(
21-
"echo $FOO",
22-
envs={"FOO": "bar"},
23-
language="bash"
24-
)
25-
26-
result_empty = await sandbox.run_code(
27-
"echo ${FOO:-default}",
28-
language="bash"
29-
)
30-
31-
assert result.text is not None
32-
assert result.text.strip() == "bar"
33-
assert result_empty.text is not None
34-
assert result_empty.text.strip() == "default"
35-
finally:
36-
await sandbox.kill()
17+
async def test_env_vars_per_execution(sandbox: AsyncSandbox):
18+
result = await sandbox.run_code(
19+
"echo $FOO",
20+
envs={"FOO": "bar"},
21+
language="bash"
22+
)
23+
24+
result_empty = await sandbox.run_code(
25+
"echo ${FOO:-default}",
26+
language="bash"
27+
)
28+
29+
assert result.logs.stdout[0] == "bar\n"
30+
assert result_empty.logs.stdout[0] == "default\n"
3731

3832
@pytest.mark.skip_debug()
3933
async def test_env_vars_overwrite():
@@ -44,7 +38,6 @@ async def test_env_vars_overwrite():
4438
language="bash",
4539
envs={"TEST_ENV_VAR": "overwrite"}
4640
)
47-
assert result.text is not None
48-
assert result.text.strip() == "overwrite"
41+
assert result.logs.stdout[0] == "overwrite\n"
4942
finally:
5043
await sandbox.kill()

‎python/tests/async/env_vars/test_deno.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,22 @@ async def test_env_vars_on_sandbox():
1414
finally:
1515
await sandbox.kill()
1616

17-
async def test_env_vars_per_execution():
18-
sandbox = await AsyncSandbox.create()
19-
try:
20-
result = await sandbox.run_code(
21-
"Deno.env.get('FOO')",
22-
envs={"FOO": "bar"},
23-
language="deno"
24-
)
25-
26-
result_empty = await sandbox.run_code(
27-
"Deno.env.get('FOO') || 'default'",
28-
language="deno"
29-
)
30-
31-
assert result.text is not None
32-
assert result.text.strip() == "bar"
33-
assert result_empty.text is not None
34-
assert result_empty.text.strip() == "default"
35-
finally:
36-
await sandbox.kill()
17+
async def test_env_vars_per_execution(sandbox: AsyncSandbox):
18+
result = await sandbox.run_code(
19+
"Deno.env.get('FOO')",
20+
envs={"FOO": "bar"},
21+
language="deno"
22+
)
23+
24+
result_empty = await sandbox.run_code(
25+
"Deno.env.get('FOO') || 'default'",
26+
language="deno"
27+
)
28+
29+
assert result.text is not None
30+
assert result.text.strip() == "bar"
31+
assert result_empty.text is not None
32+
assert result_empty.text.strip() == "default"
3733

3834
@pytest.mark.skip_debug()
3935
async def test_env_vars_overwrite():

‎python/tests/async/env_vars/test_java.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,22 @@ async def test_env_vars_on_sandbox():
1414
finally:
1515
await sandbox.kill()
1616

17-
async def test_env_vars_per_execution():
18-
sandbox = await AsyncSandbox.create()
19-
try:
20-
result = await sandbox.run_code(
21-
'System.getProperty("FOO")',
22-
envs={"FOO": "bar"},
23-
language="java"
24-
)
25-
26-
result_empty = await sandbox.run_code(
27-
'System.getProperty("FOO", "default")',
28-
language="java"
29-
)
30-
31-
assert result.text is not None
32-
assert result.text.strip() == "bar"
33-
assert result_empty.text is not None
34-
assert result_empty.text.strip() == "default"
35-
finally:
36-
await sandbox.kill()
17+
async def test_env_vars_per_execution(sandbox: AsyncSandbox):
18+
result = await sandbox.run_code(
19+
'System.getProperty("FOO")',
20+
envs={"FOO": "bar"},
21+
language="java"
22+
)
23+
24+
result_empty = await sandbox.run_code(
25+
'System.getProperty("FOO", "default")',
26+
language="java"
27+
)
28+
29+
assert result.text is not None
30+
assert result.text.strip() == "bar"
31+
assert result_empty.text is not None
32+
assert result_empty.text.strip() == "default"
3733

3834
@pytest.mark.skip_debug()
3935
async def test_env_vars_overwrite():

‎python/tests/async/env_vars/test_js.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,22 @@ async def test_env_vars_on_sandbox():
1414
finally:
1515
await sandbox.kill()
1616

17-
async def test_env_vars_per_execution():
18-
sandbox = await AsyncSandbox.create()
19-
try:
20-
result = await sandbox.run_code(
21-
"process.env.FOO",
22-
envs={"FOO": "bar"},
23-
language="javascript"
24-
)
25-
26-
result_empty = await sandbox.run_code(
27-
"process.env.FOO || 'default'",
28-
language="javascript"
29-
)
30-
31-
assert result.text is not None
32-
assert result.text.strip() == "bar"
33-
assert result_empty.text is not None
34-
assert result_empty.text.strip() == "default"
35-
finally:
36-
await sandbox.kill()
17+
async def test_env_vars_per_execution(sandbox: AsyncSandbox):
18+
result = await sandbox.run_code(
19+
"process.env.FOO",
20+
envs={"FOO": "bar"},
21+
language="javascript"
22+
)
23+
24+
result_empty = await sandbox.run_code(
25+
"process.env.FOO || 'default'",
26+
language="javascript"
27+
)
28+
29+
assert result.text is not None
30+
assert result.text.strip() == "bar"
31+
assert result_empty.text is not None
32+
assert result_empty.text.strip() == "default"
3733

3834
@pytest.mark.skip_debug()
3935
async def test_env_vars_overwrite():

‎python/tests/async/env_vars/test_python.py‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,22 @@ async def test_env_vars_on_sandbox():
1414
finally:
1515
await sandbox.kill()
1616

17-
async def test_env_vars_per_execution():
18-
sandbox = await AsyncSandbox.create()
19-
try:
20-
result = await sandbox.run_code(
21-
"import os; os.getenv('FOO')",
22-
envs={"FOO": "bar"},
23-
language="python"
24-
)
25-
26-
result_empty = await sandbox.run_code(
27-
"import os; os.getenv('FOO', 'default')",
28-
language="python"
17+
async def test_env_vars_per_execution(sandbox: AsyncSandbox):
18+
result = await sandbox.run_code(
19+
"import os; os.getenv('FOO')",
20+
envs={"FOO": "bar"},
21+
language="python"
2922
)
30-
31-
assert result.text is not None
32-
assert result.text.strip() == "bar"
33-
assert result_empty.text is not None
34-
assert result_empty.text.strip() == "default"
35-
finally:
36-
await sandbox.kill()
23+
24+
result_empty = await sandbox.run_code(
25+
"import os; os.getenv('FOO', 'default')",
26+
language="python"
27+
)
28+
29+
assert result.text is not None
30+
assert result.text.strip() == "bar"
31+
assert result_empty.text is not None
32+
assert result_empty.text.strip() == "default"
3733

3834
@pytest.mark.skip_debug()
3935
async def test_env_vars_overwrite():

‎python/tests/async/env_vars/test_r.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,22 @@ async def test_env_vars_on_sandbox():
1414
finally:
1515
await sandbox.kill()
1616

17-
async def test_env_vars_per_execution():
18-
sandbox = await AsyncSandbox.create()
19-
try:
20-
result = await sandbox.run_code(
21-
'Sys.getenv("FOO")',
22-
envs={"FOO": "bar"},
23-
language="r"
24-
)
25-
26-
result_empty = await sandbox.run_code(
27-
'Sys.getenv("FOO", unset = "default")',
28-
language="r"
29-
)
30-
31-
assert result.text is not None
32-
assert result.text.strip() == '[1] "bar"'
33-
assert result_empty.text is not None
34-
assert result_empty.text.strip() == '[1] "default"'
35-
finally:
36-
await sandbox.kill()
17+
async def test_env_vars_per_execution(sandbox: AsyncSandbox):
18+
result = await sandbox.run_code(
19+
'Sys.getenv("FOO")',
20+
envs={"FOO": "bar"},
21+
language="r"
22+
)
23+
24+
result_empty = await sandbox.run_code(
25+
'Sys.getenv("FOO", unset = "default")',
26+
language="r"
27+
)
28+
29+
assert result.text is not None
30+
assert result.text.strip() == '[1] "bar"'
31+
assert result_empty.text is not None
32+
assert result_empty.text.strip() == '[1] "default"'
3733

3834
@pytest.mark.skip_debug()
3935
async def test_env_vars_overwrite():

‎python/tests/sync/env_vars/test_bash.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,24 @@ def test_env_vars_on_sandbox():
99
"echo $TEST_ENV_VAR",
1010
language="bash"
1111
)
12-
assert result.results[0].text.strip() == "supertest"
12+
assert result.logs.stdout[0] == "supertest\n"
1313
finally:
1414
sandbox.kill()
1515

16-
def test_env_vars_per_execution():
17-
sandbox = Sandbox()
18-
try:
19-
result = sandbox.run_code(
20-
"echo $FOO",
21-
envs={"FOO": "bar"},
22-
language="bash"
23-
)
24-
25-
result_empty = sandbox.run_code(
26-
"echo ${FOO:-default}",
27-
language="bash"
28-
)
29-
30-
assert result.results[0].text.strip() == "bar"
31-
assert result_empty.results[0].text.strip() == "default"
32-
finally:
33-
sandbox.kill()
16+
def test_env_vars_per_execution(sandbox: Sandbox):
17+
result = sandbox.run_code(
18+
"echo $FOO",
19+
envs={"FOO": "bar"},
20+
language="bash"
21+
)
22+
23+
result_empty = sandbox.run_code(
24+
"echo ${FOO:-default}",
25+
language="bash"
26+
)
27+
28+
assert result.logs.stdout[0] == "bar\n"
29+
assert result_empty.logs.stdout[0] == "default\n"
3430

3531
@pytest.mark.skip_debug()
3632
def test_env_vars_overwrite():
@@ -41,6 +37,6 @@ def test_env_vars_overwrite():
4137
language="bash",
4238
envs={"TEST_ENV_VAR": "overwrite"}
4339
)
44-
assert result.results[0].text.strip() == "overwrite"
40+
assert result.logs.stdout[0] == "overwrite\n"
4541
finally:
4642
sandbox.kill()

0 commit comments

Comments
 (0)