diff --git a/src/test/e2e/25_helm_test.go b/src/test/e2e/25_helm_test.go index 933fda4eb7..03725bbe2b 100644 --- a/src/test/e2e/25_helm_test.go +++ b/src/test/e2e/25_helm_test.go @@ -146,9 +146,6 @@ func testHelmUninstallRollback(t *testing.T) { stdOut, stdErr, err = e2e.Zarf(t, "package", "deploy", evilPath, "--timeout", "10s", "--confirm") require.Error(t, err, stdOut, stdErr) - // This package contains SBOMable things but was created with --skip-sbom - require.Contains(t, string(stdErr), "This package does NOT contain an SBOM.") - // Ensure this leaves behind a dos-games chart. // We do not want to uninstall charts that had failed installs/upgrades // to prevent unintentional deletion and/or data loss in production environments. diff --git a/src/test/e2e/26_simple_packages_test.go b/src/test/e2e/26_simple_packages_test.go index 233edc2198..00f3fd746e 100644 --- a/src/test/e2e/26_simple_packages_test.go +++ b/src/test/e2e/26_simple_packages_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/zarf-dev/zarf/src/pkg/cluster" + "github.com/zarf-dev/zarf/src/pkg/logger" ) func TestDosGames(t *testing.T) { @@ -26,7 +27,8 @@ func TestDosGames(t *testing.T) { c, err := cluster.NewCluster() require.NoError(t, err) - tunnel, err := c.Connect(context.Background(), "doom") + ctx := logger.WithContext(context.Background(), e2e.GetLogger(t)) + tunnel, err := c.Connect(ctx, "doom") require.NoError(t, err) defer tunnel.Close() diff --git a/src/test/e2e/31_checksum_and_signature_test.go b/src/test/e2e/31_checksum_and_signature_test.go index c6897c8cee..3e8d0060a6 100644 --- a/src/test/e2e/31_checksum_and_signature_test.go +++ b/src/test/e2e/31_checksum_and_signature_test.go @@ -36,12 +36,11 @@ func TestChecksumAndSignature(t *testing.T) { // Test that we get an error when trying to deploy a package without providing the public key stdOut, stdErr, err = e2e.Zarf(t, "package", "deploy", pkgName, "--confirm") require.Error(t, err, stdOut, stdErr) - require.Contains(t, e2e.StripMessageFormatting(stdErr), "failed to deploy package: unable to load the package: package is signed but no key was provided - add a key with the --key flag or use the --skip-signature-validation flag and run the command again") + require.Contains(t, stdErr, "failed to deploy package: unable to load the package: package is signed but no key was provided - add a key with the --key flag or use the --skip-signature-validation flag and run the command again") // Test that we don't get an error when we remember to provide the public key stdOut, stdErr, err = e2e.Zarf(t, "package", "deploy", pkgName, publicKeyFlag, "--confirm") require.NoError(t, err, stdOut, stdErr) - require.Contains(t, stdErr, "Zarf deployment complete") // Remove the package stdOut, stdErr, err = e2e.Zarf(t, "package", "remove", pkgName, publicKeyFlag, "--confirm") diff --git a/src/test/e2e/35_custom_retries_test.go b/src/test/e2e/35_custom_retries_test.go index 99d0a229f5..54cb84eaa7 100644 --- a/src/test/e2e/35_custom_retries_test.go +++ b/src/test/e2e/35_custom_retries_test.go @@ -26,7 +26,7 @@ func TestRetries(t *testing.T) { stdOut, stdErr, err = e2e.Zarf(t, "package", "deploy", path.Join(tmpDir, pkgName), "--retries", "2", "--timeout", "3s", "--tmpdir", tmpDir, "--confirm") require.Error(t, err, stdOut, stdErr) - require.Contains(t, e2e.StripMessageFormatting(stdErr), "unable to install chart after 2 attempts") + require.Contains(t, stdErr, "unable to install chart after 2 attempts") _, _, err = e2e.Zarf(t, "package", "remove", "dos-games", "--confirm") require.NoError(t, err)