Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of e2e: replace '%s' with %q into release/0.17.x #5069

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
4 changes: 2 additions & 2 deletions testing/internal/e2e/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func WithEnv(name string, value string) Option {
func MaybeSkipTest(t testing.TB) {
if _, ok := os.LookupEnv(EnvToCheckSkip); !ok {
t.Skipf(
"Skipping test because environment variable '%s' is not set. This is needed for e2e tests.",
"Skipping test because environment variable %q is not set. This is needed for e2e tests.",
EnvToCheckSkip,
)
}
Expand All @@ -144,7 +144,7 @@ func MaybeSkipSlowTest(t testing.TB) {
MaybeSkipTest(t)
if _, ok := os.LookupEnv(EnvToCheckSlowSkip); !ok {
t.Skipf(
"Skipping test because environment variable '%s' is not set. This is needed for slow e2e tests.",
"Skipping test because environment variable %q is not set. This is needed for slow e2e tests.",
EnvToCheckSlowSkip,
)
}
Expand Down
2 changes: 1 addition & 1 deletion testing/internal/e2e/tests/base/auth_token_delete_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ func TestUserIsLoggedOutWhenAuthTokenIsDeletedCli(t *testing.T) {
)

// Expect error as the user got logged out
require.Error(t, output.Err, fmt.Sprintf("User '%s' is still logged in", testAccountName))
require.Error(t, output.Err, fmt.Sprintf("User %q is still logged in", testAccountName))
t.Log("Successfully verified that token name is invalid")
}
2 changes: 1 addition & 1 deletion testing/internal/e2e/tests/base/credential_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func TestCliStaticCredentialStore(t *testing.T) {
e2e.WithArgs("credential-stores", "read", "-id", storeId, "-format", "json"),
)
if output.Err == nil {
return fmt.Errorf("Deleted credential can still be read: '%s'", output.Stdout)
return fmt.Errorf("Deleted credential can still be read: %q", output.Stdout)
}

var response boundary.CliError
Expand Down
Loading