Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate multi-line-bash-related sandbox tests into runtime tests and fix multi-line issue #3128

Merged
merged 44 commits into from
Jul 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
7085512
Remove global config from memory
neubig Jul 24, 2024
1eba89b
Remove runtime global config
neubig Jul 24, 2024
fc9ff0c
Remove from storage
neubig Jul 24, 2024
ef3acfd
Remove global config
neubig Jul 24, 2024
26bf203
Fix event stream tests
neubig Jul 24, 2024
4a21346
Fix sandbox issue
neubig Jul 25, 2024
ac20826
Change config
neubig Jul 25, 2024
dba4790
Removed transferred tests
neubig Jul 25, 2024
444653e
Add swe env box
neubig Jul 26, 2024
048637d
Merge branch 'main' of https://github.com/OpenDevin/OpenDevin into ne…
neubig Jul 26, 2024
2d938f4
Fixes on testing
neubig Jul 26, 2024
2fc9e46
Fixed some tests
neubig Jul 26, 2024
d2f1e62
Merge with stashed changes
xingyaoww Jul 26, 2024
25510b2
Fix typing
neubig Jul 26, 2024
c15b4ad
Merge commit '2fc9e46aa2a6dd4068b637a00091a7f0cd713f8d' into xw/migra…
xingyaoww Jul 26, 2024
001db22
Fix ipython test
neubig Jul 26, 2024
5130598
Revive function
neubig Jul 26, 2024
3fbd4b2
Make temp_dir fixture
neubig Jul 26, 2024
532dc31
Merge commit '3fbd4b2e95b7b97d816ecfe15eccf2756bbec061' into xw/migra…
xingyaoww Jul 26, 2024
f3dd4c9
Remove test to avoid circular import
neubig Jul 26, 2024
5bfb9fb
Merge commit '1f6e86c932e16914b94a673f22fc791cd8d4d58c' into xw/migra…
xingyaoww Jul 26, 2024
00a265a
Merge branch 'main' of https://github.com/OpenDevin/OpenDevin into ne…
neubig Jul 26, 2024
0472e21
Merge commit '00a265a04295387ec356cdfba6058f294840848b' into xw/migra…
xingyaoww Jul 26, 2024
1e4b5e1
Merge commit '6c4cce01a7e825536a94009f09c7f54f0fa15cfc' into xw/migra…
xingyaoww Jul 26, 2024
af9c67f
fix eventstream filestore for test_runtime
xingyaoww Jul 26, 2024
006e64e
fix parse arg issue that cause integration test to fail
xingyaoww Jul 26, 2024
db81b08
Merge branch 'main' into neubig/remove_remaining_global_config
xingyaoww Jul 26, 2024
0aa6f93
support swebench pull from custom namespace
xingyaoww Jul 26, 2024
5e96ffc
Merge commit '0aa6f931af019fed827babdf402cccc7ddf10f09' into xw/migra…
xingyaoww Jul 26, 2024
ddb1cc5
Merge commit 'db81b08aceb6f2e08dbf0176bd9efc75e0133ed1' into xw/migra…
xingyaoww Jul 26, 2024
403eb17
Merge commit '3301beffecb25548c4c4cf72738b1bbb145b98a3' into xw/migra…
xingyaoww Jul 26, 2024
be4696f
add back simple tests for runtime
xingyaoww Jul 26, 2024
1cb22e0
move multi-line bash tests to test_runtime;
xingyaoww Jul 26, 2024
5a04b14
add testcase to handle PS2 prompt
xingyaoww Jul 26, 2024
e69c041
use bashlex for bash parsing to handle multi-line commands;
xingyaoww Jul 27, 2024
94cfe89
Merge commit 'f07280153aafe3531edef3d63cbe4d108ca9933a' into xw/migra…
xingyaoww Jul 27, 2024
01773d1
revert ghcr runtime change
xingyaoww Jul 27, 2024
4054fd7
fix url test
xingyaoww Jul 27, 2024
fe2e216
split_bash_commands rewrite; added test_bash_parsing.py unit test
tobitege Jul 27, 2024
235b87f
now including the test_bash_parsing.py file...
tobitege Jul 27, 2024
cf11399
fix wrong import in unit test
tobitege Jul 27, 2024
c2dd6e0
Merge commit 'cf1139950dd27d19a20420c4005fe84ef1af5426' into xw/migra…
xingyaoww Jul 27, 2024
13e70eb
move split commands test to `test_bash_parsing`
xingyaoww Jul 27, 2024
7fddfad
fix jupyter here doc for server runtime;
xingyaoww Jul 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge commit '1f6e86c932e16914b94a673f22fc791cd8d4d58c' into xw/migra…
…te-sandbox-tests
  • Loading branch information
xingyaoww committed Jul 26, 2024
commit 5bfb9fbe0a8d35f663ef0fb7c5910d8a9647a97c
34 changes: 0 additions & 34 deletions tests/unit/test_ipython.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,37 +75,3 @@ async def test_run_python_backticks():
assert (
test_code == result.content
), f'The output should contain the expected print output, got: {result.content}'


def test_sandbox_jupyter_plugin_backticks(temp_dir):
config = AppConfig(
sandbox=SandboxConfig(
box_type='ssh',
),
persist_sandbox=False,
)
box = DockerSSHBox(
config=config.sandbox,
persist_sandbox=config.persist_sandbox,
workspace_mount_path=temp_dir,
sandbox_workspace_dir=config.workspace_mount_path_in_sandbox,
cache_dir=config.cache_dir,
run_as_devin=True,
ssh_hostname=config.ssh_hostname,
ssh_password=config.ssh_password,
ssh_port=config.ssh_port,
)
box.init_plugins([JupyterRequirement])
test_code = "print('Hello, `World`!')"
expected_write_command = (
"cat > /tmp/opendevin_jupyter_temp.py <<'EOL'\n" f'{test_code}\n' 'EOL'
)
expected_execute_command = 'cat /tmp/opendevin_jupyter_temp.py | execute_cli'
exit_code, output = box.execute(expected_write_command)
exit_code, output = box.execute(expected_execute_command)
print(output)
assert exit_code == 0, 'The exit code should be 0 for ' + box.__class__.__name__
assert output.strip() == 'Hello, `World`!', (
'The output should be the same as the input for ' + box.__class__.__name__
)
box.close()
You are viewing a condensed version of this merge commit. You can view the full changes here.