fixes r

Author: mishushakov

js/tests/env_vars/r.test.ts

@@ -14,7 +14,7 @@ sandboxTest.skipIf(isDebug)('env vars on sandbox (R)', async () => {
       language: 'r',
     })
 
-    expect(result.results[0]?.text.trim()).toEqual('supertest')
+    expect(result.results[0]?.text.trim()).toEqual(`[1] "supertest"`)
   } finally {
     await sandbox.kill()
   }
@@ -23,6 +23,7 @@ sandboxTest.skipIf(isDebug)('env vars on sandbox (R)', async () => {
 sandboxTest('env vars per execution (R)', async ({ sandbox }) => {
   const result = await sandbox.runCode('Sys.getenv("FOO")', {
     envs: { FOO: 'bar' },
+    language: 'r',
   })
 
   const result_empty = await sandbox.runCode(
@@ -32,8 +33,8 @@ sandboxTest('env vars per execution (R)', async ({ sandbox }) => {
     }
   )
 
-  expect(result.results[0]?.text.trim()).toEqual('bar')
-  expect(result_empty.results[0]?.text.trim()).toEqual('default')
+  expect(result.results[0]?.text.trim()).toEqual(`[1] "bar"`)
+  expect(result_empty.results[0]?.text.trim()).toEqual(`[1] "default"`)
 })
 
 sandboxTest.skipIf(isDebug)('env vars overwrite', async () => {
@@ -47,7 +48,7 @@ sandboxTest.skipIf(isDebug)('env vars overwrite', async () => {
       envs: { TEST_ENV_VAR: 'overwrite' },
     })
 
-    expect(result.results[0]?.text.trim()).toEqual('overwrite')
+    expect(result.results[0]?.text.trim()).toEqual(`[1] "overwrite"`)
   } finally {
     await sandbox.kill()
   }

python/tests/async/env_vars/test_r.py

@@ -6,32 +6,32 @@ async def test_env_vars_on_sandbox():
     sandbox = await AsyncSandbox.create(envs={"TEST_ENV_VAR": "supertest"})
     try:
         result = await sandbox.run_code(
-            "Sys.getenv('TEST_ENV_VAR')",
+            'Sys.getenv("TEST_ENV_VAR")',
             language="r"
         )
         assert result.text is not None
-        assert result.text.strip() == "supertest"
+        assert result.text.strip() == '[1] "supertest"'
     finally:
         await sandbox.kill()
 
 async def test_env_vars_per_execution():
     sandbox = await AsyncSandbox.create()
     try:
         result = await sandbox.run_code(
-            "Sys.getenv('FOO')",
+            'Sys.getenv("FOO")',
             envs={"FOO": "bar"},
             language="r"
         )
 
         result_empty = await sandbox.run_code(
-            "Sys.getenv('FOO', unset = 'default')",
+            'Sys.getenv("FOO", unset = "default")',
             language="r"
         )
 
         assert result.text is not None
-        assert result.text.strip() == "bar"
+        assert result.text.strip() == '[1] "bar"'
         assert result_empty.text is not None
-        assert result_empty.text.strip() == "default"
+        assert result_empty.text.strip() == '[1] "default"'
     finally:
         await sandbox.kill()
 
@@ -40,11 +40,11 @@ async def test_env_vars_overwrite():
     sandbox = await AsyncSandbox.create(envs={"TEST_ENV_VAR": "supertest"})
     try:
         result = await sandbox.run_code(
-            "Sys.getenv('TEST_ENV_VAR')",
+            'Sys.getenv("TEST_ENV_VAR")',
             language="r",
             envs={"TEST_ENV_VAR": "overwrite"}
         )
         assert result.text is not None
-        assert result.text.strip() == "overwrite"
+        assert result.text.strip() == '[1] "overwrite"'
     finally:
         await sandbox.kill()

python/tests/sync/env_vars/test_r.py

@@ -9,7 +9,7 @@ def test_env_vars_on_sandbox():
             "Sys.getenv('TEST_ENV_VAR')",
             language="r"
         )
-        assert result.results[0].text.strip() == "supertest"
+        assert result.results[0].text.strip() == '[1] "supertest"'
     finally:
         sandbox.kill()
 
@@ -27,8 +27,8 @@ def test_env_vars_per_execution():
             language="r"
         )
 
-        assert result.results[0].text.strip() == "bar"
-        assert result_empty.results[0].text.strip() == "default"
+        assert result.results[0].text.strip() == '[1] "bar"'
+        assert result_empty.results[0].text.strip() == '[1] "default"'
     finally:
         sandbox.kill()
 
@@ -41,6 +41,6 @@ def test_env_vars_overwrite():
             language="r",
             envs={"TEST_ENV_VAR": "overwrite"}
         )
-        assert result.results[0].text.strip() == "overwrite"
+        assert result.results[0].text.strip() == '[1] "overwrite"'
     finally:
         sandbox.kill()

template/server/messaging.py

@@ -148,7 +148,7 @@ async def set_env_vars(self, env_vars: Dict[StrictStr, str]):
             elif self.language == "deno":
                 env_commands.append(f"Deno.env.set('{k}', '{v}')")
             elif self.language == "r":
-                env_commands.append(f"Sys.setenv('{k}' = '{v}')")
+                env_commands.append(f'Sys.setenv({k} = "{v}")')
             elif self.language == "java":
                 env_commands.append(f'System.setProperty("{k}", "{v}")')
             elif self.language == "bash":