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.

Sign up for GitHub

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

pam/integration-tests: Wait for command prompts text before continuing #821

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

pam/integration-tests: Wait for command prompts text before continuing #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b28df4
pam/integration-tests/vhs-helpers: Support matching slashes in regexes
3v1n0 Feb 28, 2025
21bd8b1
pam/integration-tests/vhs-helper: Add support for Shell context in ty…
3v1n0 Feb 28, 2025
42e2130
pam/integration-tests/tapes: Use TypeInPrompt+Shell to type commands
3v1n0 Feb 28, 2025
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
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/authd_stopped.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/bad_password.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/form_with_button.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/local_broker.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/local_group.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/local_user.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/local_user_preset.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/mandatory_password_reset.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/max_attempts.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/mfa_auth.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/mfa_reset_pwquality_auth.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/not_root.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/optional_password_reset_skip.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_auth_fail.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_bad_password.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_local_broker.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_mfa.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_not_changed.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_not_confirmed.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_not_root.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions pam/integration-tests/testdata/tapes/cli/passwd_rejected.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_sigint.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
5 changes: 2 additions & 3 deletions pam/integration-tests/testdata/tapes/cli/passwd_simple.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_unexistent_user.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/qr_code.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/qr_code_quick_regenerate.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
6 changes: 2 additions & 4 deletions pam/integration-tests/testdata/tapes/cli/remember_broker_and_mode.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/sigint.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/simple_auth.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/simple_auth_empty_user.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/simple_auth_with_preset_user.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/simple_auth_with_unsupported_args.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/switch_auth_mode.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/switch_local_broker.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/switch_preset_username.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/switch_username.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/cli/unexistent_user.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name\n/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/native/authd_stopped.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/native/bad_password.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait+Prompt /Choose your provider/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/native/cancel_key_user.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username:\n/
Show
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/connection_error.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Hide
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Show

Hide
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/native/form_with_button.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait+Prompt /Choose your provider/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/native/form_with_button_polkit.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait+Prompt /Gimme your password/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/native/local_broker.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/native/local_group.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
TypeInPrompt+Shell "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait+Prompt /Choose your provider/
Show
Expand Down
3 changes: 1 addition & 2 deletions pam/integration-tests/testdata/tapes/native/local_ssh.tape
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading