From 7b28df422acc3ac30f7a22d4b2ffb8f98dbd0282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 1 Mar 2025 00:28:54 +0100 Subject: [PATCH 1/3] pam/integration-tests/vhs-helpers: Support matching slashes in regexes In Type in prompt commands we may include slashes, but VHS doesn't escape them properly, so we need to replace them manually with their character-escaped version. See: https://github.com/charmbracelet/vhs/issues/592 --- pam/integration-tests/vhs-helpers_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pam/integration-tests/vhs-helpers_test.go b/pam/integration-tests/vhs-helpers_test.go index dced59286..b3cd1ef6e 100644 --- a/pam/integration-tests/vhs-helpers_test.go +++ b/pam/integration-tests/vhs-helpers_test.go @@ -539,13 +539,16 @@ func evaluateTapeVariables(t *testing.T, tapeString string, td tapeData, testTyp // we need to use a regex to match it. const maxLength = 80 if len(value) <= maxLength { - return regexp.QuoteMeta(value) + value = regexp.QuoteMeta(value) + // See https://github.com/charmbracelet/vhs/issues/592 + return strings.ReplaceAll(value, "/", `\x{2F}`) } valueRegex := regexp.QuoteMeta(value[:maxLength]) for i := maxLength; i < len(value); i++ { valueRegex += regexp.QuoteMeta(string(value[i])) + `\n?` } - return valueRegex + // See https://github.com/charmbracelet/vhs/issues/592 + return strings.ReplaceAll(valueRegex, "/", `\x{2F}`) } for _, m := range vhsTypeAndWaitUsername.FindAllStringSubmatch(tapeString, -1) { From 21bd8b1d84a02c1241a4dd5273472b3821af5a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 1 Mar 2025 00:31:53 +0100 Subject: [PATCH 2/3] pam/integration-tests/vhs-helper: Add support for Shell context in type commands Add support for TypeInPrompt+Shell command so that we can add specific rules in case we're matching a shell prompt, compared to a standard one --- pam/integration-tests/vhs-helpers_test.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pam/integration-tests/vhs-helpers_test.go b/pam/integration-tests/vhs-helpers_test.go index b3cd1ef6e..d74c94c03 100644 --- a/pam/integration-tests/vhs-helpers_test.go +++ b/pam/integration-tests/vhs-helpers_test.go @@ -154,9 +154,9 @@ var ( vhsTypeAndWaitUsername = regexp.MustCompile(`(.*)\bTypeUsername[\t ]+` + vhsQuotedTextMatch) // vhsTypeAndWaitVisiblePrompt adds support for typing some text in an "Echo On" prompt, // waiting for it being printed in the terminal. - vhsTypeAndWaitVisiblePrompt = regexp.MustCompile(`(.*)\bTypeInPrompt[\t ]+` + vhsQuotedTextMatch) + vhsTypeAndWaitVisiblePrompt = regexp.MustCompile(`(.*)\bTypeInPrompt(\+(Shell|PAM|CLI))?[\t ]+` + vhsQuotedTextMatch) // vhsTypeAndWaitCLIPassword adds support for typing the CLI password, waiting for the expected output. - vhsTypeAndWaitCLIPassword = regexp.MustCompile(`(.*)\bTypeCLIPassword[\t ]+` + vhsQuotedTextMatch) + vhsTypeAndWaitCLIPassword = regexp.MustCompile(`(.*)\bTypeCLIPassword(())?[\t ]+` + vhsQuotedTextMatch) // vhsClearTape clears the tape by clearing the terminal. vhsClearTape = regexp.MustCompile(`\bClearTerminal\b`) @@ -563,15 +563,21 @@ func evaluateTapeVariables(t *testing.T, tapeString string, td tapeData, testTyp } waitForPromptText := func(matches []string, style pam.Style) { - fullMatch, prefix, promptValue := matches[0], matches[1], matches[2] + fullMatch, prefix, context, promptValue := matches[0], matches[1], matches[3], matches[4] visibleValue := promptValue if style == pam.PromptEchoOff { visibleValue = strings.Repeat("*", len(promptValue)) } + initialWait := `Wait+Screen /\n>[ \t]*\n/` + prePromptRegex := `:\n` + if context == "Shell" { + initialWait = "Wait" + prePromptRegex = `(^|\n)` + } commands := []string{ - `Wait+Screen /\n>[ \t]*\n/`, + initialWait, fmt.Sprintf("Type `%s`", promptValue), - fmt.Sprintf(`Wait+Suffix /:\n> %s(\n[^>].+)*/`, multiLineValueRegex(visibleValue)), + fmt.Sprintf(`Wait+Suffix /%s> %s(\n[^>].+)*/`, prePromptRegex, multiLineValueRegex(visibleValue)), } tapeString = strings.ReplaceAll(tapeString, fullMatch, prefix+strings.Join(commands, "\n"+prefix)) From 42e21307a1c2003e78a5312b4142f7e4a6019ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 28 Feb 2025 23:46:57 +0000 Subject: [PATCH 3/3] pam/integration-tests/tapes: Use TypeInPrompt+Shell to type commands Sometime we're too fast in writing the command and the final character isn't recorded yet by VHS, causing failures that aren't really true. So wait for the whole command being typed before typing enter and continuing. Closes: #713 --- pam/integration-tests/testdata/tapes/cli/authd_stopped.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/bad_password.tape | 3 +-- .../testdata/tapes/cli/form_with_button.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/local_broker.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/local_group.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/local_user.tape | 3 +-- .../testdata/tapes/cli/local_user_preset.tape | 3 +-- .../testdata/tapes/cli/mandatory_password_reset.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/max_attempts.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/mfa_auth.tape | 3 +-- .../testdata/tapes/cli/mfa_reset_pwquality_auth.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/not_root.tape | 3 +-- .../testdata/tapes/cli/optional_password_reset_skip.tape | 3 +-- .../testdata/tapes/cli/passwd_auth_fail.tape | 3 +-- .../testdata/tapes/cli/passwd_bad_password.tape | 3 +-- .../testdata/tapes/cli/passwd_local_broker.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/passwd_mfa.tape | 3 +-- .../testdata/tapes/cli/passwd_not_changed.tape | 3 +-- .../testdata/tapes/cli/passwd_not_confirmed.tape | 3 +-- .../testdata/tapes/cli/passwd_not_root.tape | 3 +-- .../testdata/tapes/cli/passwd_rejected.tape | 5 ++--- pam/integration-tests/testdata/tapes/cli/passwd_sigint.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/passwd_simple.tape | 5 ++--- .../testdata/tapes/cli/passwd_unexistent_user.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/qr_code.tape | 3 +-- .../testdata/tapes/cli/qr_code_quick_regenerate.tape | 3 +-- .../testdata/tapes/cli/remember_broker_and_mode.tape | 6 ++---- pam/integration-tests/testdata/tapes/cli/sigint.tape | 3 +-- pam/integration-tests/testdata/tapes/cli/simple_auth.tape | 3 +-- .../testdata/tapes/cli/simple_auth_empty_user.tape | 3 +-- .../testdata/tapes/cli/simple_auth_with_preset_user.tape | 3 +-- .../tapes/cli/simple_auth_with_unsupported_args.tape | 2 +- .../testdata/tapes/cli/switch_auth_mode.tape | 3 +-- .../testdata/tapes/cli/switch_local_broker.tape | 3 +-- .../testdata/tapes/cli/switch_preset_username.tape | 3 +-- .../testdata/tapes/cli/switch_username.tape | 3 +-- .../testdata/tapes/cli/unexistent_user.tape | 3 +-- .../testdata/tapes/native/authd_stopped.tape | 3 +-- .../testdata/tapes/native/bad_password.tape | 3 +-- .../testdata/tapes/native/cancel_key_user.tape | 3 +-- .../testdata/tapes/native/connection_error.tape | 2 +- .../testdata/tapes/native/form_with_button.tape | 3 +-- .../testdata/tapes/native/form_with_button_polkit.tape | 3 +-- .../testdata/tapes/native/local_broker.tape | 3 +-- .../testdata/tapes/native/local_group.tape | 3 +-- pam/integration-tests/testdata/tapes/native/local_ssh.tape | 3 +-- pam/integration-tests/testdata/tapes/native/local_user.tape | 3 +-- .../testdata/tapes/native/local_user_preset.tape | 3 +-- .../testdata/tapes/native/mandatory_password_reset.tape | 3 +-- .../testdata/tapes/native/max_attempts.tape | 3 +-- pam/integration-tests/testdata/tapes/native/mfa_auth.tape | 3 +-- .../testdata/tapes/native/mfa_reset_pwquality_auth.tape | 3 +-- pam/integration-tests/testdata/tapes/native/not_root.tape | 3 +-- .../tapes/native/optional_password_reset_accept.tape | 3 +-- .../testdata/tapes/native/optional_password_reset_skip.tape | 3 +-- .../testdata/tapes/native/passwd_auth_fail.tape | 3 +-- .../testdata/tapes/native/passwd_bad_password.tape | 3 +-- .../testdata/tapes/native/passwd_local_broker.tape | 3 +-- pam/integration-tests/testdata/tapes/native/passwd_mfa.tape | 3 +-- .../testdata/tapes/native/passwd_not_changed.tape | 3 +-- .../testdata/tapes/native/passwd_not_confirmed.tape | 3 +-- .../testdata/tapes/native/passwd_not_root.tape | 3 +-- .../testdata/tapes/native/passwd_rejected.tape | 4 ++-- .../testdata/tapes/native/passwd_sigint.tape | 3 +-- .../testdata/tapes/native/passwd_simple.tape | 5 ++--- .../testdata/tapes/native/passwd_unexistent_user.tape | 3 +-- pam/integration-tests/testdata/tapes/native/qr_code.tape | 3 +-- .../testdata/tapes/native/remember_broker_and_mode.tape | 6 ++---- pam/integration-tests/testdata/tapes/native/sigint.tape | 3 +-- .../testdata/tapes/native/simple_auth.tape | 3 +-- .../tapes/native/simple_auth_with_unsupported_args.tape | 3 +-- .../tapes/native/simple_auth_with_user_selection.tape | 3 +-- .../testdata/tapes/native/simple_ssh_auth.tape | 3 +-- .../testdata/tapes/native/switch_auth_mode.tape | 3 +-- .../testdata/tapes/native/switch_local_broker.tape | 3 +-- .../testdata/tapes/native/switch_preset_username.tape | 3 +-- .../testdata/tapes/native/switch_username.tape | 3 +-- .../testdata/tapes/native/unexistent_user.tape | 3 +-- .../testdata/tapes/ssh/cancel_key_user.tape | 3 +-- .../testdata/tapes/ssh/simple_auth_with_shell.tape | 3 +-- .../testdata/tapes/ssh/unexistent_user.tape | 3 +-- 81 files changed, 87 insertions(+), 167 deletions(-) diff --git a/pam/integration-tests/testdata/tapes/cli/authd_stopped.tape b/pam/integration-tests/testdata/tapes/cli/authd_stopped.tape index bf8ed5f20..1dd60f791 100644 --- a/pam/integration-tests/testdata/tapes/cli/authd_stopped.tape +++ b/pam/integration-tests/testdata/tapes/cli/authd_stopped.tape @@ -6,8 +6,7 @@ Enter Show Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/bad_password.tape b/pam/integration-tests/testdata/tapes/cli/bad_password.tape index 1b3f8d7ea..572ca0092 100644 --- a/pam/integration-tests/testdata/tapes/cli/bad_password.tape +++ b/pam/integration-tests/testdata/tapes/cli/bad_password.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/form_with_button.tape b/pam/integration-tests/testdata/tapes/cli/form_with_button.tape index f0dedd46a..20d02fd7f 100644 --- a/pam/integration-tests/testdata/tapes/cli/form_with_button.tape +++ b/pam/integration-tests/testdata/tapes/cli/form_with_button.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/local_broker.tape b/pam/integration-tests/testdata/tapes/cli/local_broker.tape index 05b603aad..cac391fb2 100644 --- a/pam/integration-tests/testdata/tapes/cli/local_broker.tape +++ b/pam/integration-tests/testdata/tapes/cli/local_broker.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/local_group.tape b/pam/integration-tests/testdata/tapes/cli/local_group.tape index 8af38bef7..06e69c655 100644 --- a/pam/integration-tests/testdata/tapes/cli/local_group.tape +++ b/pam/integration-tests/testdata/tapes/cli/local_group.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/local_user.tape b/pam/integration-tests/testdata/tapes/cli/local_user.tape index 49e3cafc0..2a1e8c813 100644 --- a/pam/integration-tests/testdata/tapes/cli/local_user.tape +++ b/pam/integration-tests/testdata/tapes/cli/local_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/local_user_preset.tape b/pam/integration-tests/testdata/tapes/cli/local_user_preset.tape index 0d560ea82..f1aed1510 100644 --- a/pam/integration-tests/testdata/tapes/cli/local_user_preset.tape +++ b/pam/integration-tests/testdata/tapes/cli/local_user_preset.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter ${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT} Show diff --git a/pam/integration-tests/testdata/tapes/cli/mandatory_password_reset.tape b/pam/integration-tests/testdata/tapes/cli/mandatory_password_reset.tape index 383a27831..618108a86 100644 --- a/pam/integration-tests/testdata/tapes/cli/mandatory_password_reset.tape +++ b/pam/integration-tests/testdata/tapes/cli/mandatory_password_reset.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/max_attempts.tape b/pam/integration-tests/testdata/tapes/cli/max_attempts.tape index b0cf411c1..ed676b465 100644 --- a/pam/integration-tests/testdata/tapes/cli/max_attempts.tape +++ b/pam/integration-tests/testdata/tapes/cli/max_attempts.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/mfa_auth.tape b/pam/integration-tests/testdata/tapes/cli/mfa_auth.tape index 321d9c3d8..1d2b93d62 100644 --- a/pam/integration-tests/testdata/tapes/cli/mfa_auth.tape +++ b/pam/integration-tests/testdata/tapes/cli/mfa_auth.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/mfa_reset_pwquality_auth.tape b/pam/integration-tests/testdata/tapes/cli/mfa_reset_pwquality_auth.tape index 452310624..ba221182a 100644 --- a/pam/integration-tests/testdata/tapes/cli/mfa_reset_pwquality_auth.tape +++ b/pam/integration-tests/testdata/tapes/cli/mfa_reset_pwquality_auth.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/not_root.tape b/pam/integration-tests/testdata/tapes/cli/not_root.tape index 0d560ea82..f1aed1510 100644 --- a/pam/integration-tests/testdata/tapes/cli/not_root.tape +++ b/pam/integration-tests/testdata/tapes/cli/not_root.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter ${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT} Show diff --git a/pam/integration-tests/testdata/tapes/cli/optional_password_reset_skip.tape b/pam/integration-tests/testdata/tapes/cli/optional_password_reset_skip.tape index 62aefbd28..887e74fa9 100644 --- a/pam/integration-tests/testdata/tapes/cli/optional_password_reset_skip.tape +++ b/pam/integration-tests/testdata/tapes/cli/optional_password_reset_skip.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_auth_fail.tape b/pam/integration-tests/testdata/tapes/cli/passwd_auth_fail.tape index 23b811e98..0e9940c9b 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_auth_fail.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_auth_fail.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_bad_password.tape b/pam/integration-tests/testdata/tapes/cli/passwd_bad_password.tape index fd1376c15..4e081a008 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_bad_password.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_bad_password.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_local_broker.tape b/pam/integration-tests/testdata/tapes/cli/passwd_local_broker.tape index e1e1f3d55..491b07a7b 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_local_broker.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_local_broker.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_mfa.tape b/pam/integration-tests/testdata/tapes/cli/passwd_mfa.tape index 08b0fc11b..14d3d3e31 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_mfa.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_mfa.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_not_changed.tape b/pam/integration-tests/testdata/tapes/cli/passwd_not_changed.tape index 5d7a63dbb..18b7dc964 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_not_changed.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_not_changed.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_not_confirmed.tape b/pam/integration-tests/testdata/tapes/cli/passwd_not_confirmed.tape index b16936ca2..458b7d039 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_not_confirmed.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_not_confirmed.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_not_root.tape b/pam/integration-tests/testdata/tapes/cli/passwd_not_root.tape index 8647fb720..319acba4d 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_not_root.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_not_root.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter ${AUTHD_TEST_TAPE_COMMAND_PASSWD_FINAL_WAIT} Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_rejected.tape b/pam/integration-tests/testdata/tapes/cli/passwd_rejected.tape index 5ae6ac64c..b71d6b403 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_rejected.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_rejected.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show @@ -64,7 +63,7 @@ ClearTerminal # Repeat again, to check that we can use still use another new password Hide -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_sigint.tape b/pam/integration-tests/testdata/tapes/cli/passwd_sigint.tape index 60b9f1dd0..f222e4d13 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_sigint.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_sigint.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_simple.tape b/pam/integration-tests/testdata/tapes/cli/passwd_simple.tape index bfcb2a8e9..9270d331c 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_simple.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_simple.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show @@ -47,7 +46,7 @@ Show ClearTerminal Hide -Type "${AUTHD_TEST_TAPE_LOGIN_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_LOGIN_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/passwd_unexistent_user.tape b/pam/integration-tests/testdata/tapes/cli/passwd_unexistent_user.tape index 236b33df2..090fdb370 100644 --- a/pam/integration-tests/testdata/tapes/cli/passwd_unexistent_user.tape +++ b/pam/integration-tests/testdata/tapes/cli/passwd_unexistent_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/qr_code.tape b/pam/integration-tests/testdata/tapes/cli/qr_code.tape index 9908e0e3f..2f32e15b5 100644 --- a/pam/integration-tests/testdata/tapes/cli/qr_code.tape +++ b/pam/integration-tests/testdata/tapes/cli/qr_code.tape @@ -4,8 +4,7 @@ Enter Show Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Screen /Select your provider/ Wait+Screen /2. ExampleBroker/ diff --git a/pam/integration-tests/testdata/tapes/cli/qr_code_quick_regenerate.tape b/pam/integration-tests/testdata/tapes/cli/qr_code_quick_regenerate.tape index 83a18d891..fd78e7afd 100644 --- a/pam/integration-tests/testdata/tapes/cli/qr_code_quick_regenerate.tape +++ b/pam/integration-tests/testdata/tapes/cli/qr_code_quick_regenerate.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/remember_broker_and_mode.tape b/pam/integration-tests/testdata/tapes/cli/remember_broker_and_mode.tape index 92f951dc7..8a19e6486 100644 --- a/pam/integration-tests/testdata/tapes/cli/remember_broker_and_mode.tape +++ b/pam/integration-tests/testdata/tapes/cli/remember_broker_and_mode.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show @@ -37,8 +36,7 @@ Show ClearTerminal Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/sigint.tape b/pam/integration-tests/testdata/tapes/cli/sigint.tape index 7b1f61e28..f94ebc3ce 100644 --- a/pam/integration-tests/testdata/tapes/cli/sigint.tape +++ b/pam/integration-tests/testdata/tapes/cli/sigint.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/simple_auth.tape b/pam/integration-tests/testdata/tapes/cli/simple_auth.tape index a71f763e2..2b27294e7 100644 --- a/pam/integration-tests/testdata/tapes/cli/simple_auth.tape +++ b/pam/integration-tests/testdata/tapes/cli/simple_auth.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/simple_auth_empty_user.tape b/pam/integration-tests/testdata/tapes/cli/simple_auth_empty_user.tape index 68f6b8d45..739bd9be0 100644 --- a/pam/integration-tests/testdata/tapes/cli/simple_auth_empty_user.tape +++ b/pam/integration-tests/testdata/tapes/cli/simple_auth_empty_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/simple_auth_with_preset_user.tape b/pam/integration-tests/testdata/tapes/cli/simple_auth_with_preset_user.tape index 9b4a4ac7c..0f34adbbc 100644 --- a/pam/integration-tests/testdata/tapes/cli/simple_auth_with_preset_user.tape +++ b/pam/integration-tests/testdata/tapes/cli/simple_auth_with_preset_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Screen /Select your provider/ Wait+Screen /2. ExampleBroker/ diff --git a/pam/integration-tests/testdata/tapes/cli/simple_auth_with_unsupported_args.tape b/pam/integration-tests/testdata/tapes/cli/simple_auth_with_unsupported_args.tape index f0d19e9fd..1eae07716 100644 --- a/pam/integration-tests/testdata/tapes/cli/simple_auth_with_unsupported_args.tape +++ b/pam/integration-tests/testdata/tapes/cli/simple_auth_with_unsupported_args.tape @@ -1,5 +1,5 @@ Hide -Type "${AUTHD_TEST_TAPE_COMMAND} invalid_flag=foo bar" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND} invalid_flag=foo bar" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/switch_auth_mode.tape b/pam/integration-tests/testdata/tapes/cli/switch_auth_mode.tape index 008db1ac5..94e7174e1 100644 --- a/pam/integration-tests/testdata/tapes/cli/switch_auth_mode.tape +++ b/pam/integration-tests/testdata/tapes/cli/switch_auth_mode.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/switch_local_broker.tape b/pam/integration-tests/testdata/tapes/cli/switch_local_broker.tape index f621ad875..b14f8ff54 100644 --- a/pam/integration-tests/testdata/tapes/cli/switch_local_broker.tape +++ b/pam/integration-tests/testdata/tapes/cli/switch_local_broker.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/switch_preset_username.tape b/pam/integration-tests/testdata/tapes/cli/switch_preset_username.tape index d57a07e92..3983ebe0f 100644 --- a/pam/integration-tests/testdata/tapes/cli/switch_preset_username.tape +++ b/pam/integration-tests/testdata/tapes/cli/switch_preset_username.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Screen /Select your provider/ Wait+Screen /2. ExampleBroker/ diff --git a/pam/integration-tests/testdata/tapes/cli/switch_username.tape b/pam/integration-tests/testdata/tapes/cli/switch_username.tape index dac030dca..b8fa38fce 100644 --- a/pam/integration-tests/testdata/tapes/cli/switch_username.tape +++ b/pam/integration-tests/testdata/tapes/cli/switch_username.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/cli/unexistent_user.tape b/pam/integration-tests/testdata/tapes/cli/unexistent_user.tape index 42d689ca4..e711683c3 100644 --- a/pam/integration-tests/testdata/tapes/cli/unexistent_user.tape +++ b/pam/integration-tests/testdata/tapes/cli/unexistent_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username: user name\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/authd_stopped.tape b/pam/integration-tests/testdata/tapes/native/authd_stopped.tape index e86ef7926..52fd36143 100644 --- a/pam/integration-tests/testdata/tapes/native/authd_stopped.tape +++ b/pam/integration-tests/testdata/tapes/native/authd_stopped.tape @@ -6,8 +6,7 @@ Enter Show Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/bad_password.tape b/pam/integration-tests/testdata/tapes/native/bad_password.tape index 7b3947c5e..8272c2497 100644 --- a/pam/integration-tests/testdata/tapes/native/bad_password.tape +++ b/pam/integration-tests/testdata/tapes/native/bad_password.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/cancel_key_user.tape b/pam/integration-tests/testdata/tapes/native/cancel_key_user.tape index dfa7c1bdd..6ec93ed18 100644 --- a/pam/integration-tests/testdata/tapes/native/cancel_key_user.tape +++ b/pam/integration-tests/testdata/tapes/native/cancel_key_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/connection_error.tape b/pam/integration-tests/testdata/tapes/native/connection_error.tape index 39d778d39..9930a8a31 100644 --- a/pam/integration-tests/testdata/tapes/native/connection_error.tape +++ b/pam/integration-tests/testdata/tapes/native/connection_error.tape @@ -1,5 +1,5 @@ Hide -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Show Hide diff --git a/pam/integration-tests/testdata/tapes/native/form_with_button.tape b/pam/integration-tests/testdata/tapes/native/form_with_button.tape index e72dcfef3..45212e0b5 100644 --- a/pam/integration-tests/testdata/tapes/native/form_with_button.tape +++ b/pam/integration-tests/testdata/tapes/native/form_with_button.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/form_with_button_polkit.tape b/pam/integration-tests/testdata/tapes/native/form_with_button_polkit.tape index 3e7df8c62..938fe12b2 100644 --- a/pam/integration-tests/testdata/tapes/native/form_with_button_polkit.tape +++ b/pam/integration-tests/testdata/tapes/native/form_with_button_polkit.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Gimme your password/ Show diff --git a/pam/integration-tests/testdata/tapes/native/local_broker.tape b/pam/integration-tests/testdata/tapes/native/local_broker.tape index 407348acd..e7482f052 100644 --- a/pam/integration-tests/testdata/tapes/native/local_broker.tape +++ b/pam/integration-tests/testdata/tapes/native/local_broker.tape @@ -1,6 +1,5 @@ Hide -Wait /^>\n/ -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/local_group.tape b/pam/integration-tests/testdata/tapes/native/local_group.tape index 608f32b71..bbff75a13 100644 --- a/pam/integration-tests/testdata/tapes/native/local_group.tape +++ b/pam/integration-tests/testdata/tapes/native/local_group.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/local_ssh.tape b/pam/integration-tests/testdata/tapes/native/local_ssh.tape index 75dc51162..f1aed1510 100644 --- a/pam/integration-tests/testdata/tapes/native/local_ssh.tape +++ b/pam/integration-tests/testdata/tapes/native/local_ssh.tape @@ -1,6 +1,5 @@ Hide -Wait /^>\n/ -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter ${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT} Show diff --git a/pam/integration-tests/testdata/tapes/native/local_user.tape b/pam/integration-tests/testdata/tapes/native/local_user.tape index eae9bbc2e..9c38c96e0 100644 --- a/pam/integration-tests/testdata/tapes/native/local_user.tape +++ b/pam/integration-tests/testdata/tapes/native/local_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/local_user_preset.tape b/pam/integration-tests/testdata/tapes/native/local_user_preset.tape index 75dc51162..f1aed1510 100644 --- a/pam/integration-tests/testdata/tapes/native/local_user_preset.tape +++ b/pam/integration-tests/testdata/tapes/native/local_user_preset.tape @@ -1,6 +1,5 @@ Hide -Wait /^>\n/ -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter ${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT} Show diff --git a/pam/integration-tests/testdata/tapes/native/mandatory_password_reset.tape b/pam/integration-tests/testdata/tapes/native/mandatory_password_reset.tape index 4125ea6e8..979bc91b2 100644 --- a/pam/integration-tests/testdata/tapes/native/mandatory_password_reset.tape +++ b/pam/integration-tests/testdata/tapes/native/mandatory_password_reset.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/max_attempts.tape b/pam/integration-tests/testdata/tapes/native/max_attempts.tape index 1b49cc75a..632e1258e 100644 --- a/pam/integration-tests/testdata/tapes/native/max_attempts.tape +++ b/pam/integration-tests/testdata/tapes/native/max_attempts.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/mfa_auth.tape b/pam/integration-tests/testdata/tapes/native/mfa_auth.tape index adbab55a0..51e267a09 100644 --- a/pam/integration-tests/testdata/tapes/native/mfa_auth.tape +++ b/pam/integration-tests/testdata/tapes/native/mfa_auth.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/mfa_reset_pwquality_auth.tape b/pam/integration-tests/testdata/tapes/native/mfa_reset_pwquality_auth.tape index a2ded9026..e5cb27c56 100644 --- a/pam/integration-tests/testdata/tapes/native/mfa_reset_pwquality_auth.tape +++ b/pam/integration-tests/testdata/tapes/native/mfa_reset_pwquality_auth.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/not_root.tape b/pam/integration-tests/testdata/tapes/native/not_root.tape index 0d560ea82..f1aed1510 100644 --- a/pam/integration-tests/testdata/tapes/native/not_root.tape +++ b/pam/integration-tests/testdata/tapes/native/not_root.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter ${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT} Show diff --git a/pam/integration-tests/testdata/tapes/native/optional_password_reset_accept.tape b/pam/integration-tests/testdata/tapes/native/optional_password_reset_accept.tape index 38bd5e62c..9a07ee287 100644 --- a/pam/integration-tests/testdata/tapes/native/optional_password_reset_accept.tape +++ b/pam/integration-tests/testdata/tapes/native/optional_password_reset_accept.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/optional_password_reset_skip.tape b/pam/integration-tests/testdata/tapes/native/optional_password_reset_skip.tape index 5fbf0ad65..b750a9647 100644 --- a/pam/integration-tests/testdata/tapes/native/optional_password_reset_skip.tape +++ b/pam/integration-tests/testdata/tapes/native/optional_password_reset_skip.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_auth_fail.tape b/pam/integration-tests/testdata/tapes/native/passwd_auth_fail.tape index 40914ad9b..7fb1247f0 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_auth_fail.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_auth_fail.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_bad_password.tape b/pam/integration-tests/testdata/tapes/native/passwd_bad_password.tape index 35c796996..069b5e155 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_bad_password.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_bad_password.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_local_broker.tape b/pam/integration-tests/testdata/tapes/native/passwd_local_broker.tape index cb3910fae..0c26089a0 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_local_broker.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_local_broker.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_mfa.tape b/pam/integration-tests/testdata/tapes/native/passwd_mfa.tape index 47b2dd736..5f3e9d560 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_mfa.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_mfa.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_not_changed.tape b/pam/integration-tests/testdata/tapes/native/passwd_not_changed.tape index f11d3811e..816ba9116 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_not_changed.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_not_changed.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_not_confirmed.tape b/pam/integration-tests/testdata/tapes/native/passwd_not_confirmed.tape index 3c86a2c2d..424ef6d57 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_not_confirmed.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_not_confirmed.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_not_root.tape b/pam/integration-tests/testdata/tapes/native/passwd_not_root.tape index 8647fb720..319acba4d 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_not_root.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_not_root.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter ${AUTHD_TEST_TAPE_COMMAND_PASSWD_FINAL_WAIT} Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_rejected.tape b/pam/integration-tests/testdata/tapes/native/passwd_rejected.tape index 201e20b30..29b8b2965 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_rejected.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_rejected.tape @@ -1,5 +1,5 @@ Hide -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show @@ -57,7 +57,7 @@ ClearTerminal # Repeat again, to check that we can use still use another new password Hide -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_sigint.tape b/pam/integration-tests/testdata/tapes/native/passwd_sigint.tape index f7246a9e5..227dc3a9b 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_sigint.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_sigint.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_simple.tape b/pam/integration-tests/testdata/tapes/native/passwd_simple.tape index 66e3b79ab..1bee21b7a 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_simple.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_simple.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show @@ -41,7 +40,7 @@ Show ClearTerminal Hide -Type "${AUTHD_TEST_TAPE_LOGIN_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_LOGIN_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/passwd_unexistent_user.tape b/pam/integration-tests/testdata/tapes/native/passwd_unexistent_user.tape index c4f2ad245..35800fe2a 100644 --- a/pam/integration-tests/testdata/tapes/native/passwd_unexistent_user.tape +++ b/pam/integration-tests/testdata/tapes/native/passwd_unexistent_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/qr_code.tape b/pam/integration-tests/testdata/tapes/native/qr_code.tape index fa21501bc..eff984c10 100644 --- a/pam/integration-tests/testdata/tapes/native/qr_code.tape +++ b/pam/integration-tests/testdata/tapes/native/qr_code.tape @@ -5,8 +5,7 @@ Enter Show Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/remember_broker_and_mode.tape b/pam/integration-tests/testdata/tapes/native/remember_broker_and_mode.tape index 8d5286329..4bbe23a12 100644 --- a/pam/integration-tests/testdata/tapes/native/remember_broker_and_mode.tape +++ b/pam/integration-tests/testdata/tapes/native/remember_broker_and_mode.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show @@ -51,8 +50,7 @@ Show ClearTerminal Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Show Hide diff --git a/pam/integration-tests/testdata/tapes/native/sigint.tape b/pam/integration-tests/testdata/tapes/native/sigint.tape index 82f641e1a..8a59e7805 100644 --- a/pam/integration-tests/testdata/tapes/native/sigint.tape +++ b/pam/integration-tests/testdata/tapes/native/sigint.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/simple_auth.tape b/pam/integration-tests/testdata/tapes/native/simple_auth.tape index 608f32b71..bbff75a13 100644 --- a/pam/integration-tests/testdata/tapes/native/simple_auth.tape +++ b/pam/integration-tests/testdata/tapes/native/simple_auth.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/simple_auth_with_unsupported_args.tape b/pam/integration-tests/testdata/tapes/native/simple_auth_with_unsupported_args.tape index 608f32b71..bbff75a13 100644 --- a/pam/integration-tests/testdata/tapes/native/simple_auth_with_unsupported_args.tape +++ b/pam/integration-tests/testdata/tapes/native/simple_auth_with_unsupported_args.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/simple_auth_with_user_selection.tape b/pam/integration-tests/testdata/tapes/native/simple_auth_with_user_selection.tape index e21c1a7a4..ab65e0fea 100644 --- a/pam/integration-tests/testdata/tapes/native/simple_auth_with_user_selection.tape +++ b/pam/integration-tests/testdata/tapes/native/simple_auth_with_user_selection.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Nth(1) /Username:/ Show diff --git a/pam/integration-tests/testdata/tapes/native/simple_ssh_auth.tape b/pam/integration-tests/testdata/tapes/native/simple_ssh_auth.tape index 608f32b71..bbff75a13 100644 --- a/pam/integration-tests/testdata/tapes/native/simple_ssh_auth.tape +++ b/pam/integration-tests/testdata/tapes/native/simple_ssh_auth.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/switch_auth_mode.tape b/pam/integration-tests/testdata/tapes/native/switch_auth_mode.tape index 12edce4f2..2f9f290cc 100644 --- a/pam/integration-tests/testdata/tapes/native/switch_auth_mode.tape +++ b/pam/integration-tests/testdata/tapes/native/switch_auth_mode.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/switch_local_broker.tape b/pam/integration-tests/testdata/tapes/native/switch_local_broker.tape index 38f9f7f27..f9e60f670 100644 --- a/pam/integration-tests/testdata/tapes/native/switch_local_broker.tape +++ b/pam/integration-tests/testdata/tapes/native/switch_local_broker.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/switch_preset_username.tape b/pam/integration-tests/testdata/tapes/native/switch_preset_username.tape index f826becac..78af9c459 100644 --- a/pam/integration-tests/testdata/tapes/native/switch_preset_username.tape +++ b/pam/integration-tests/testdata/tapes/native/switch_preset_username.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/native/switch_username.tape b/pam/integration-tests/testdata/tapes/native/switch_username.tape index 59a1fa4b7..9a3d255fe 100644 --- a/pam/integration-tests/testdata/tapes/native/switch_username.tape +++ b/pam/integration-tests/testdata/tapes/native/switch_username.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Username:\n/ Show diff --git a/pam/integration-tests/testdata/tapes/native/unexistent_user.tape b/pam/integration-tests/testdata/tapes/native/unexistent_user.tape index fdfa984a8..ee7782e2c 100644 --- a/pam/integration-tests/testdata/tapes/native/unexistent_user.tape +++ b/pam/integration-tests/testdata/tapes/native/unexistent_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/ssh/cancel_key_user.tape b/pam/integration-tests/testdata/tapes/ssh/cancel_key_user.tape index 7d86bc5cb..4282deed4 100644 --- a/pam/integration-tests/testdata/tapes/ssh/cancel_key_user.tape +++ b/pam/integration-tests/testdata/tapes/ssh/cancel_key_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Password:/ Show diff --git a/pam/integration-tests/testdata/tapes/ssh/simple_auth_with_shell.tape b/pam/integration-tests/testdata/tapes/ssh/simple_auth_with_shell.tape index 61c009712..b023150a4 100644 --- a/pam/integration-tests/testdata/tapes/ssh/simple_auth_with_shell.tape +++ b/pam/integration-tests/testdata/tapes/ssh/simple_auth_with_shell.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait+Prompt /Choose your provider/ Show diff --git a/pam/integration-tests/testdata/tapes/ssh/unexistent_user.tape b/pam/integration-tests/testdata/tapes/ssh/unexistent_user.tape index 7d86bc5cb..4282deed4 100644 --- a/pam/integration-tests/testdata/tapes/ssh/unexistent_user.tape +++ b/pam/integration-tests/testdata/tapes/ssh/unexistent_user.tape @@ -1,6 +1,5 @@ Hide -Wait -Type "${AUTHD_TEST_TAPE_COMMAND}" +TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}" Enter Wait /Password:/ Show