Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 2 additions & 36 deletions test/e2e-scenario/framework-tests/e2e-lib-helpers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,37 +375,6 @@ exit 0
expect(r.stdout).toContain("DEBIAN_FRONTEND=noninteractive");
});

it("artifact_helper_should_collect_known_logs_without_failing_when_missing", () => {
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "e2e-art-"));
const srcDir = path.join(tmp, "src");
const dstDir = path.join(tmp, "out");
fs.mkdirSync(srcDir);
fs.writeFileSync(path.join(srcDir, "present.log"), "hello\n");
const r = runBash(`
set -euo pipefail
. "${RUNTIME_LIB}/artifacts.sh"
e2e_artifact_collect_file "${srcDir}/present.log" "${dstDir}/present.log"
e2e_artifact_collect_file "${srcDir}/missing.log" "${dstDir}/missing.log" || true
ls "${dstDir}"
`);
expect(r.status, r.stderr).toBe(0);
expect(fs.existsSync(path.join(dstDir, "present.log"))).toBe(true);
expect(fs.existsSync(path.join(dstDir, "missing.log"))).toBe(false);
expect(r.stderr + r.stdout).toMatch(/missing\.log|not found|skipping/i);
fs.rmSync(tmp, { recursive: true, force: true });
});

it("gateway_helper_should_report_unhealthy_gateway_clearly", () => {
// Pick a port very unlikely to be bound.
const r = runBash(`
set -euo pipefail
. "${RUNTIME_LIB}/gateway.sh"
e2e_gateway_assert_healthy "http://127.0.0.1:65531"
`);
expect(r.status).not.toBe(0);
expect(r.stderr).toMatch(/65531|gateway|unhealthy/i);
});

it("sandbox_helper_should_fail_for_missing_sandbox_name", () => {
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "e2e-sb-"));
try {
Expand Down Expand Up @@ -846,16 +815,13 @@ describe("Phase 1.C fixtures", () => {
});

it("older_base_image_should_emit_dockerfile_pointing_at_tagged_base", () => {
const r = runBash(
`
const r = runBash(`
set -euo pipefail
. "${FIXTURES}/older-base-image.sh"
df="$(older_base_image_prepare v0.0.1-test)"
echo "DF=$df"
head -n1 "$df"
`,
{ E2E_DRY_RUN: "1" },
);
`);
expect(r.status, r.stderr).toBe(0);
expect(r.stdout).toMatch(/^FROM .*:v0\.0\.1-test/m);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
#
# Negative-state probe. Asserts that no sandbox was created by a
# scenario whose expected_state declares sandbox.expected=absent
# (preflight failure, onboarding failures). Typed replacement for
# the legacy run-scenario.sh inline check
# `openshell sandbox list | grep -Fq "${sandbox_name}"`.
# (preflight failure, onboarding failures).

set -euo pipefail

Expand Down
50 changes: 0 additions & 50 deletions test/e2e-scenario/runtime/lib/artifacts.sh

This file was deleted.

29 changes: 0 additions & 29 deletions test/e2e-scenario/runtime/lib/cleanup.sh

This file was deleted.

34 changes: 0 additions & 34 deletions test/e2e-scenario/runtime/lib/negative.sh

This file was deleted.

54 changes: 0 additions & 54 deletions test/e2e-scenario/runtime/lib/port-holder.sh

This file was deleted.

25 changes: 0 additions & 25 deletions test/e2e-scenario/runtime/run-scenario.sh

This file was deleted.

21 changes: 0 additions & 21 deletions test/e2e-scenario/runtime/run-suites.sh

This file was deleted.

Loading