Skip to content

Commit de3bb5d

Browse files
mishushakovmishushakov
committed
fixed setting env vars in java
1 parent ad92618 commit de3bb5d

File tree

7 files changed

+25
-22
lines changed

7 files changed

+25
-22
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sandboxTest.skipIf(isDebug)('env vars on sandbox (java)', async () => {
1111

1212
try {
1313
const result = await sandbox.runCode(
14-
`System.out.println(System.getenv("TEST_ENV_VAR"))`,
14+
`System.getProperty("TEST_ENV_VAR")`,
1515
{
1616
language: 'java',
1717
}
@@ -25,15 +25,15 @@ sandboxTest.skipIf(isDebug)('env vars on sandbox (java)', async () => {
2525

2626
sandboxTest('env vars per execution (java)', async ({ sandbox }) => {
2727
const result = await sandbox.runCode(
28-
`System.out.println(System.getenv("FOO"))`,
28+
`System.getProperty("FOO")`,
2929
{
3030
envs: { FOO: 'bar' },
3131
language: 'java',
3232
}
3333
)
3434

3535
const result_empty = await sandbox.runCode(
36-
`System.out.println(System.getenv("FOO") != null ? System.getenv("FOO") : "default")`,
36+
`System.getProperty("FOO", "default")`,
3737
{
3838
language: 'java',
3939
}
@@ -50,7 +50,7 @@ sandboxTest.skipIf(isDebug)('env vars overwrite', async () => {
5050

5151
try {
5252
const result = await sandbox.runCode(
53-
`System.out.println(System.getenv("TEST_ENV_VAR"))`,
53+
`System.getProperty("TEST_ENV_VAR")`,
5454
{
5555
language: 'java',
5656
envs: { TEST_ENV_VAR: 'overwrite' },

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sandboxTest.skipIf(isDebug)('env vars on sandbox (python)', async () => {
1111

1212
try {
1313
const result = await sandbox.runCode(
14-
`import os; x = os.getenv('TEST_ENV_VAR'); x`,
14+
`import os; os.getenv('TEST_ENV_VAR')`,
1515
{
1616
language: 'python',
1717
}
@@ -26,6 +26,7 @@ sandboxTest.skipIf(isDebug)('env vars on sandbox (python)', async () => {
2626
sandboxTest('env vars per execution (python)', async ({ sandbox }) => {
2727
const result = await sandbox.runCode("import os; os.getenv('FOO')", {
2828
envs: { FOO: 'bar' },
29+
language: 'python',
2930
})
3031

3132
const result_empty = await sandbox.runCode(
@@ -46,7 +47,7 @@ sandboxTest.skipIf(isDebug)('env vars overwrite', async () => {
4647

4748
try {
4849
const result = await sandbox.runCode(
49-
`import os; x = os.getenv('TEST_ENV_VAR'); x`,
50+
`import os; os.getenv('TEST_ENV_VAR')`,
5051
{
5152
language: 'python',
5253
envs: { TEST_ENV_VAR: 'overwrite' },

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ async def test_env_vars_on_sandbox():
66
sandbox = await AsyncSandbox.create(envs={"TEST_ENV_VAR": "supertest"})
77
try:
88
result = await sandbox.run_code(
9-
"String x = System.getenv(\"TEST_ENV_VAR\"); x",
9+
'System.getProperty("TEST_ENV_VAR")',
1010
language="java"
1111
)
1212
assert result.text is not None
@@ -18,13 +18,13 @@ async def test_env_vars_per_execution():
1818
sandbox = await AsyncSandbox.create()
1919
try:
2020
result = await sandbox.run_code(
21-
"System.getenv(\"FOO\")",
21+
'System.getProperty("FOO")',
2222
envs={"FOO": "bar"},
2323
language="java"
2424
)
2525

2626
result_empty = await sandbox.run_code(
27-
"String value = System.getenv(\"FOO\"); value != null ? value : \"default\"",
27+
'System.getProperty("FOO", "default")',
2828
language="java"
2929
)
3030

@@ -40,7 +40,7 @@ async def test_env_vars_overwrite():
4040
sandbox = await AsyncSandbox.create(envs={"TEST_ENV_VAR": "supertest"})
4141
try:
4242
result = await sandbox.run_code(
43-
"String x = System.getenv(\"TEST_ENV_VAR\"); x",
43+
'System.getProperty("TEST_ENV_VAR")',
4444
language="java",
4545
envs={"TEST_ENV_VAR": "overwrite"}
4646
)

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ async def test_env_vars_on_sandbox():
66
sandbox = await AsyncSandbox.create(envs={"TEST_ENV_VAR": "supertest"})
77
try:
88
result = await sandbox.run_code(
9-
"import os; x = os.getenv('TEST_ENV_VAR'); x",
9+
"import os; os.getenv('TEST_ENV_VAR')",
1010
language="python"
1111
)
1212
assert result.text is not None
@@ -19,7 +19,8 @@ async def test_env_vars_per_execution():
1919
try:
2020
result = await sandbox.run_code(
2121
"import os; os.getenv('FOO')",
22-
envs={"FOO": "bar"}
22+
envs={"FOO": "bar"},
23+
language="python"
2324
)
2425

2526
result_empty = await sandbox.run_code(
@@ -39,7 +40,7 @@ async def test_env_vars_overwrite():
3940
sandbox = await AsyncSandbox.create(envs={"TEST_ENV_VAR": "supertest"})
4041
try:
4142
result = await sandbox.run_code(
42-
"import os; x = os.getenv('TEST_ENV_VAR'); x",
43+
"import os; os.getenv('TEST_ENV_VAR')",
4344
language="python",
4445
envs={"TEST_ENV_VAR": "overwrite"}
4546
)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def test_env_vars_on_sandbox():
66
sandbox = Sandbox(envs={"TEST_ENV_VAR": "supertest"})
77
try:
88
result = sandbox.run_code(
9-
"String x = System.getenv(\"TEST_ENV_VAR\"); x",
9+
'System.getProperty("TEST_ENV_VAR")',
1010
language="java"
1111
)
1212
assert result.results[0].text.strip() == "supertest"
@@ -17,13 +17,13 @@ def test_env_vars_per_execution():
1717
sandbox = Sandbox()
1818
try:
1919
result = sandbox.run_code(
20-
"System.getenv(\"FOO\")",
20+
'System.getProperty("FOO")',
2121
envs={"FOO": "bar"},
2222
language="java"
2323
)
2424

2525
result_empty = sandbox.run_code(
26-
"String value = System.getenv(\"FOO\"); value != null ? value : \"default\"",
26+
'System.getProperty("FOO", "default")',
2727
language="java"
2828
)
2929

@@ -37,7 +37,7 @@ def test_env_vars_overwrite():
3737
sandbox = Sandbox(envs={"TEST_ENV_VAR": "supertest"})
3838
try:
3939
result = sandbox.run_code(
40-
"String x = System.getenv(\"TEST_ENV_VAR\"); x",
40+
'System.getProperty("TEST_ENV_VAR")',
4141
language="java",
4242
envs={"TEST_ENV_VAR": "overwrite"}
4343
)

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def test_env_vars_on_sandbox():
66
sandbox = Sandbox(envs={"TEST_ENV_VAR": "supertest"})
77
try:
88
result = sandbox.run_code(
9-
"import os; x = os.getenv('TEST_ENV_VAR'); x",
9+
"import os; os.getenv('TEST_ENV_VAR')",
1010
language="python"
1111
)
1212
assert result.results[0].text.strip() == "supertest"
@@ -18,7 +18,8 @@ def test_env_vars_per_execution():
1818
try:
1919
result = sandbox.run_code(
2020
"import os; os.getenv('FOO')",
21-
envs={"FOO": "bar"}
21+
envs={"FOO": "bar"},
22+
language="python"
2223
)
2324

2425
result_empty = sandbox.run_code(
@@ -36,7 +37,7 @@ def test_env_vars_overwrite():
3637
sandbox = Sandbox(envs={"TEST_ENV_VAR": "supertest"})
3738
try:
3839
result = sandbox.run_code(
39-
"import os; x = os.getenv('TEST_ENV_VAR'); x",
40+
"import os; os.getenv('TEST_ENV_VAR')",
4041
language="python",
4142
envs={"TEST_ENV_VAR": "overwrite"}
4243
)

‎template/server/messaging.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ async def set_env_vars(self, env_vars: Dict[StrictStr, str]):
150150
elif self.language == "r":
151151
env_commands.append(f"Sys.setenv('{k}' = '{v}')")
152152
elif self.language == "java":
153-
env_commands.append(f"System.setProperty('{k}', '{v}')")
153+
env_commands.append(f'System.setProperty("{k}", "{v}")')
154154
elif self.language == "bash":
155155
env_commands.append(f"export {k}='{v}'")
156156
else:
@@ -199,7 +199,7 @@ async def reset_env_vars(self, env_vars: Dict[StrictStr, str]):
199199
elif self.language == "r":
200200
remove_commands.append(f"Sys.unsetenv('{key}')")
201201
elif self.language == "java":
202-
remove_commands.append(f"System.clearProperty('{key}')")
202+
remove_commands.append(f'System.clearProperty("{key}")')
203203
elif self.language == "bash":
204204
remove_commands.append(f"unset {key}")
205205
else:

0 commit comments

Comments
 (0)