Skip to content

Commit

Permalink
Loosen matchers on integration tests to reduce failures
Browse files Browse the repository at this point in the history
  • Loading branch information
@colincasey
colincasey committed Dec 5, 2024
1 parent 00deb4d commit bf95f61
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions tests/integration_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ fn test_general_usage_output() {
assert_contains!(ctx.pack_stdout, "Virtual package `libvips` is provided by `[email protected]`");
assert_contains!(ctx.pack_stdout, "Skipping `libvips42` because `[email protected]` is already installed on the system");
assert_contains!(ctx.pack_stdout, "Determining install requirements for requested package `curl`");
assert_contains!(ctx.pack_stdout, "Adding `[email protected]1ubuntu1.18` (forced)");
assert_contains_match!(ctx.pack_stdout, "Adding `[email protected].*` \\(forced\\)");

assert_contains!(ctx.pack_stdout, "## Installing packages");
assert_contains!(ctx.pack_stdout, "Requesting packages");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://archive.ubuntu.com/ubuntu/pool/universe/libg/libgwenhywfar/libgwenhywfar79_5.9.0-1_amd64.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://archive.ubuntu.com/ubuntu/pool/universe/libg/libgwenhywfar/libgwenhywfar-data_5.9.0-1_all.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://archive.ubuntu.com/ubuntu/pool/main/x/xmlsec1/xmlsec1_1.2.33-1build2_amd64.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]1ubuntu1.18` from http://archive.ubuntu.com/ubuntu/pool/main/c/curl/curl_7.81.0-1ubuntu1.18_amd64.deb");
assert_contains_match!(ctx.pack_stdout, "`[email protected].*` from http://archive.ubuntu.com/ubuntu/pool/main/c/curl/curl_7.81.0-.*_amd64.deb");
assert_contains!(ctx.pack_stdout, "Downloading");
assert_contains!(ctx.pack_stdout, "Installation complete");

Expand Down Expand Up @@ -159,14 +159,14 @@ fn test_general_usage_output() {
assert_contains!(ctx.pack_stdout, "Virtual package `libvips` is provided by `[email protected]`");
assert_contains!(ctx.pack_stdout, "Skipping `libvips42t64` because `[email protected]` is already installed on the system");
assert_contains!(ctx.pack_stdout, "Determining install requirements for requested package `curl`");
assert_contains!(ctx.pack_stdout, "Adding `[email protected]2ubuntu10.4` (forced)");
assert_contains_match!(ctx.pack_stdout, "Adding `[email protected].*` \\(forced\\)");

assert_contains!(ctx.pack_stdout, "## Installing packages");
assert_contains!(ctx.pack_stdout, "Requesting packages");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://archive.ubuntu.com/ubuntu/pool/universe/libg/libgwenhywfar/libgwenhywfar79t64_5.10.2-2.1build4_amd64.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://archive.ubuntu.com/ubuntu/pool/universe/libg/libgwenhywfar/libgwenhywfar-data_5.10.2-2.1build4_all.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://archive.ubuntu.com/ubuntu/pool/main/x/xmlsec1/xmlsec1_1.2.39-5build2_amd64.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]2ubuntu10.4` from http://security.ubuntu.com/ubuntu/pool/main/c/curl/curl_8.5.0-2ubuntu10.4_amd64.deb");
assert_contains_match!(ctx.pack_stdout, "`[email protected].*` from http://security.ubuntu.com/ubuntu/pool/main/c/curl/curl_8.5.0-.*_amd64.deb");
assert_contains!(ctx.pack_stdout, "Downloading");
assert_contains!(ctx.pack_stdout, "Installation complete");

Expand Down Expand Up @@ -216,14 +216,14 @@ fn test_general_usage_output() {
assert_contains!(ctx.pack_stdout, "Virtual package `libvips` is provided by `[email protected]`");
assert_contains!(ctx.pack_stdout, "Skipping `libvips42t64` because `[email protected]` is already installed on the system");
assert_contains!(ctx.pack_stdout, "Determining install requirements for requested package `curl`");
assert_contains!(ctx.pack_stdout, "Adding `[email protected]2ubuntu10.4` (forced)");
assert_contains_match!(ctx.pack_stdout, "Adding `[email protected].*` \\(forced\\)");

assert_contains!(ctx.pack_stdout, "## Installing packages");
assert_contains!(ctx.pack_stdout, "Requesting packages");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://ports.ubuntu.com/ubuntu-ports/pool/universe/libg/libgwenhywfar/libgwenhywfar79t64_5.10.2-2.1build4_arm64.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://ports.ubuntu.com/ubuntu-ports/pool/universe/libg/libgwenhywfar/libgwenhywfar-data_5.10.2-2.1build4_all.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]` from http://ports.ubuntu.com/ubuntu-ports/pool/main/x/xmlsec1/xmlsec1_1.2.39-5build2_arm64.deb");
assert_contains!(ctx.pack_stdout, "`[email protected]2ubuntu10.4` from http://ports.ubuntu.com/ubuntu-ports/pool/main/c/curl/curl_8.5.0-2ubuntu10.4_arm64.deb");
assert_contains_match!(ctx.pack_stdout, "`[email protected].*` from http://ports.ubuntu.com/ubuntu-ports/pool/main/c/curl/curl_8.5.0-.*_arm64.deb");
assert_contains!(ctx.pack_stdout, "Downloading");
assert_contains!(ctx.pack_stdout, "Installation complete");

Expand Down Expand Up @@ -282,7 +282,7 @@ fn test_general_usage_output_on_rebuild() {
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]1ubuntu1.18`");
assert_contains_match!(ctx.pack_stdout, "`[email protected].*`");
}
("heroku/builder:24", "amd64") => {
assert_contains_match!(ctx.pack_stdout, r"Restored release file from cache \(http://archive.ubuntu.com/ubuntu/dists/noble/InRelease\)");
Expand All @@ -299,7 +299,7 @@ fn test_general_usage_output_on_rebuild() {
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]2ubuntu10.4`");
assert_contains_match!(ctx.pack_stdout, "`[email protected].*`");
}
("heroku/builder:24", "arm64") => {
assert_contains_match!(ctx.pack_stdout, r"Restored release file from cache \(http://ports.ubuntu.com/ubuntu-ports/dists/noble/InRelease\)");
Expand All @@ -316,7 +316,7 @@ fn test_general_usage_output_on_rebuild() {
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]`");
assert_contains!(ctx.pack_stdout, "`[email protected]2ubuntu10.4`");
assert_contains_match!(ctx.pack_stdout, "`[email protected].*`");
}
_ => panic_unsupported_test_configuration(),
}
Expand Down

0 comments on commit bf95f61

Please sign in to comment.