@@ -2635,17 +2635,27 @@ grep -Fxq preserved "$TMPDIR/caller-fd"
|
2635 | 2635 | expect(runner).not.toContain("cat /tmp/openclaw-codex-plugin-pack.log"); |
2636 | 2636 | expect(runner).toContain("tail -n 120 /tmp/openclaw-codex-agent-after-uninstall.err"); |
2637 | 2637 | expect(runner).not.toContain("cat /tmp/openclaw-codex-agent-after-uninstall.err"); |
2638 | | -const profileSourceIndex = runner.indexOf('source "$PROFILE_FILE"'); |
2639 | | -const agentTimeoutEnvIndex = runner.indexOf( |
| 2638 | +const earlyAgentTimeoutEnvIndex = runner.indexOf( |
2640 | 2639 | "docker_e2e_read_positive_int_env OPENCLAW_CODEX_NPM_PLUGIN_AGENT_TIMEOUT_SECONDS 420", |
2641 | 2640 | ); |
| 2641 | +const profileSourceIndex = runner.indexOf('source "$PROFILE_FILE"'); |
| 2642 | +const finalAgentTimeoutEnvIndex = runner.lastIndexOf( |
| 2643 | +"docker_e2e_read_positive_int_env OPENCLAW_CODEX_NPM_PLUGIN_AGENT_TIMEOUT_SECONDS", |
| 2644 | +); |
2642 | 2645 | const dockerBuildIndex = runner.indexOf("docker_e2e_build_or_reuse"); |
| 2646 | +const preparePluginSpecIndex = runner.indexOf("\nprepare_codex_plugin_spec\n"); |
| 2647 | +expect(earlyAgentTimeoutEnvIndex).toBeGreaterThanOrEqual(0); |
| 2648 | +expect(dockerBuildIndex).toBeGreaterThan(earlyAgentTimeoutEnvIndex); |
| 2649 | +expect(preparePluginSpecIndex).toBeGreaterThan(dockerBuildIndex); |
2643 | 2650 | expect(profileSourceIndex).toBeGreaterThanOrEqual(0); |
2644 | | -expect(agentTimeoutEnvIndex).toBeGreaterThan(profileSourceIndex); |
2645 | | -expect(dockerBuildIndex).toBeGreaterThan(agentTimeoutEnvIndex); |
| 2651 | +expect(profileSourceIndex).toBeGreaterThan(preparePluginSpecIndex); |
| 2652 | +expect(finalAgentTimeoutEnvIndex).toBeGreaterThan(profileSourceIndex); |
2646 | 2653 | expect(runner).toContain( |
2647 | 2654 | "docker_e2e_read_positive_int_env OPENCLAW_CODEX_NPM_PLUGIN_AGENT_TIMEOUT_SECONDS 420", |
2648 | 2655 | ); |
| 2656 | +expect(runner).toContain( |
| 2657 | +'docker_e2e_read_positive_int_env OPENCLAW_CODEX_NPM_PLUGIN_AGENT_TIMEOUT_SECONDS "$AGENT_TURN_TIMEOUT_SECONDS"', |
| 2658 | +); |
2649 | 2659 | expect(runner).toContain( |
2650 | 2660 | 'COMMAND_TIMEOUT="${OPENCLAW_E2E_COMMAND_TIMEOUT:-$((10#$AGENT_TURN_TIMEOUT_SECONDS + 60))s}"', |
2651 | 2661 | ); |
|