Skip to content

Commit

Permalink
pam/integration-tests: Re-implement Wait pattern to improve debugging
Browse files Browse the repository at this point in the history 
In case `Wait` fails we don't have relevant debugging output, so let's
just simulate it by using Wait+Screen regex.

Do this for both versions of wait, taking care of the default pattern,
if any.

See: charmbracelet/vhs#533
  • Loading branch information
@3v1n0
3v1n0 committed Dec 11, 2024
1 parent 496f166 commit 929ce5f
Show file tree
Hide file tree
Showing 51 changed files with 78 additions and 64 deletions.
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/bad_password.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/form_with_button.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/local_broker.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/local_group.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/local_user.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/mandatory_password_reset.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/max_attempts.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/mfa_auth.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/mfa_reset_pwquality_auth.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/optional_password_reset_skip.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/passwd_auth_fail.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/passwd_bad_password.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/passwd_local_broker.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/passwd_mfa.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/passwd_not_changed.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/passwd_not_confirmed.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
4 changes: 2 additions & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_rejected.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down Expand Up @@ -66,7 +66,7 @@ ClearTerminal
Hide
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/passwd_sigint.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
4 changes: 2 additions & 2 deletions pam/integration-tests/testdata/tapes/cli/passwd_simple.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down Expand Up @@ -49,7 +49,7 @@ ClearTerminal
Hide
Type "${AUTHD_TEST_TAPE_LOGIN_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/passwd_unexistent_user.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/qr_code_quick_regenerate.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
4 changes: 2 additions & 2 deletions pam/integration-tests/testdata/tapes/cli/remember_broker_and_mode.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down Expand Up @@ -40,7 +40,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/sigint.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/simple_auth.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
6 changes: 3 additions & 3 deletions pam/integration-tests/testdata/tapes/cli/simple_auth_empty_user.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand All @@ -11,12 +11,12 @@ Show

Hide
Backspace 26
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/simple_auth_with_unsupported_args.tape
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Hide
Type "${AUTHD_TEST_TAPE_COMMAND} invalid_flag=foo bar"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/switch_auth_mode.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/switch_local_broker.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
8 changes: 4 additions & 4 deletions pam/integration-tests/testdata/tapes/cli/switch_username.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand All @@ -17,11 +17,11 @@ Show

Hide
Escape
Wait /Username: user-integration-switch-username$/
Wait /Username: user-integration-switch-username\n/
Backspace 15
Wait /Username: user-integration-$/
Wait /Username: user-integration-\n/
Type "username-switched"
Wait /Username: user-integration-username-switched$/
Wait /Username: user-integration-username-switched\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/cli/unexistent_user.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username: user name$/
Wait /Username: user name\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/cancel_key_user.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username:$/
Wait /Username:\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/local_broker.tape
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Hide
Wait />$/
Wait /^>\n/
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait+Prompt /Choose your provider/
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/local_ssh.tape
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Hide
Wait />$/
Wait /^>\n/
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT}
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/local_user.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username:$/
Wait /Username:\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/local_user_preset.tape
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Hide
Wait />$/
Wait /^>\n/
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT}
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/passwd_auth_fail.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username:$/
Wait /Username:\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/passwd_bad_password.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username:$/
Wait /Username:\n/
Show

Hide
Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/testdata/tapes/native/passwd_local_broker.tape
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Hide
Wait
Type "${AUTHD_TEST_TAPE_COMMAND}"
Enter
Wait /Username:$/
Wait /Username:\n/
Show

Hide
Expand Down
Loading

0 comments on commit 929ce5f

Please sign in to comment.