From fba2218760cd9275025cbd189e8c467839247959 Mon Sep 17 00:00:00 2001 From: Engel Nyst Date: Wed, 16 Jul 2025 22:16:40 +0200 Subject: [PATCH] Fix integration tests (#9746) --- .github/workflows/integration-runner.yml | 6 +++--- .../integration_tests/tests/t04_git_staging.py | 12 ++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/integration-runner.yml b/.github/workflows/integration-runner.yml index 594f98c471..e8d318c3e6 100644 --- a/.github/workflows/integration-runner.yml +++ b/.github/workflows/integration-runner.yml @@ -54,7 +54,7 @@ jobs: Hi! I started running the integration tests on your PR. You will receive a comment with the results shortly. - name: Install Python dependencies using Poetry - run: poetry install --with dev,test,runtime + run: poetry install --with dev,test,runtime,evaluation - name: Configure config.toml for testing with Haiku env: @@ -179,8 +179,8 @@ jobs: id: create_comment uses: KeisukeYamashita/create-comment@v1 with: - # if triggered by PR, use PR number, otherwise use 5318 as fallback issue number for manual triggers - number: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || 5318 }} + # if triggered by PR, use PR number, otherwise use 9745 as fallback issue number for manual triggers + number: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || 9745 }} unique: false comment: | Trigger by: ${{ github.event_name == 'pull_request' && format('Pull Request (integration-test label on PR #{0})', github.event.pull_request.number) || (github.event_name == 'workflow_dispatch' && format('Manual Trigger: {0}', github.event.inputs.reason)) || 'Nightly Scheduled Run' }} diff --git a/evaluation/integration_tests/tests/t04_git_staging.py b/evaluation/integration_tests/tests/t04_git_staging.py index d15f6d1ba9..1c3daaba37 100644 --- a/evaluation/integration_tests/tests/t04_git_staging.py +++ b/evaluation/integration_tests/tests/t04_git_staging.py @@ -25,7 +25,8 @@ class Test(BaseIntegrationTest): assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}') # git add - action = CmdRunAction(command='git add hello.py .vscode/') + cmd_str = 'git add hello.py' + action = CmdRunAction(command=cmd_str) obs = runtime.run_action(action) assert_and_raise(obs.exit_code == 0, f'Failed to run command: {obs.content}') @@ -40,15 +41,6 @@ class Test(BaseIntegrationTest): reason=f'Failed to cat /workspace/hello.py: {obs.content}.', ) - # check if the file /workspace/.vscode/settings.json exists - action = CmdRunAction(command='cat /workspace/.vscode/settings.json') - obs = runtime.run_action(action) - if obs.exit_code != 0: - return TestResult( - success=False, - reason=f'Failed to cat /workspace/.vscode/settings.json: {obs.content}.', - ) - # check if the staging area is empty action = CmdRunAction(command='git status') obs = runtime.run_action(action)