Skip to content

Commit 5738228

Browse files
3v1n03v1n0
committed
pam/integration-tests: Re-implement Wait pattern to improve debugging
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
1 parent 223804d commit 5738228

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+80
-64
lines changed

‎pam/integration-tests/testdata/tapes/cli/bad_password.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/form_with_button.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/local_broker.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/local_group.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/local_user.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/mandatory_password_reset.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/max_attempts.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/mfa_auth.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/mfa_reset_pwquality_auth.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/optional_password_reset_skip.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_auth_fail.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_bad_password.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_local_broker.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_mfa.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_not_changed.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_not_confirmed.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_rejected.tape

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide
@@ -66,7 +66,7 @@ ClearTerminal
6666
Hide
6767
Type "${AUTHD_TEST_TAPE_COMMAND}"
6868
Enter
69-
Wait /Username: user name$/
69+
Wait /Username: user name\n/
7070
Show
7171

7272
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_sigint.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_simple.tape

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide
@@ -49,7 +49,7 @@ ClearTerminal
4949
Hide
5050
Type "${AUTHD_TEST_TAPE_LOGIN_COMMAND}"
5151
Enter
52-
Wait /Username: user name$/
52+
Wait /Username: user name\n/
5353
Show
5454

5555
Hide

‎pam/integration-tests/testdata/tapes/cli/passwd_unexistent_user.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/qr_code_quick_regenerate.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/remember_broker_and_mode.tape

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide
@@ -40,7 +40,7 @@ Hide
4040
Wait
4141
Type "${AUTHD_TEST_TAPE_COMMAND}"
4242
Enter
43-
Wait /Username: user name$/
43+
Wait /Username: user name\n/
4444
Show
4545

4646
Hide

‎pam/integration-tests/testdata/tapes/cli/sigint.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/simple_auth.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/simple_auth_empty_user.tape

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide
@@ -11,12 +11,12 @@ Show
1111

1212
Hide
1313
Backspace 26
14-
Wait /Username: user name$/
14+
Wait /Username: user name\n/
1515
Show
1616

1717
Hide
1818
Enter
19-
Wait /Username: user name$/
19+
Wait /Username: user name\n/
2020
Show
2121

2222
Hide

‎pam/integration-tests/testdata/tapes/cli/simple_auth_with_unsupported_args.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Hide
22
Type "${AUTHD_TEST_TAPE_COMMAND} invalid_flag=foo bar"
33
Enter
4-
Wait /Username: user name$/
4+
Wait /Username: user name\n/
55
Show
66

77
Hide

‎pam/integration-tests/testdata/tapes/cli/switch_auth_mode.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/switch_local_broker.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/cli/switch_username.tape

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide
@@ -17,11 +17,11 @@ Show
1717

1818
Hide
1919
Escape
20-
Wait /Username: user-integration-switch-username$/
20+
Wait /Username: user-integration-switch-username\n/
2121
Backspace 15
22-
Wait /Username: user-integration-$/
22+
Wait /Username: user-integration-\n/
2323
Type "username-switched"
24-
Wait /Username: user-integration-username-switched$/
24+
Wait /Username: user-integration-username-switched\n/
2525
Show
2626

2727
Hide

‎pam/integration-tests/testdata/tapes/cli/unexistent_user.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username: user name$/
5+
Wait /Username: user name\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/native/cancel_key_user.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username:$/
5+
Wait /Username:\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/native/local_broker.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Hide
2-
Wait />$/
2+
Wait /^>\n/
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
55
Wait+Prompt /Choose your provider/

‎pam/integration-tests/testdata/tapes/native/local_ssh.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Hide
2-
Wait />$/
2+
Wait /^>\n/
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
55
${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT}

‎pam/integration-tests/testdata/tapes/native/local_user.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username:$/
5+
Wait /Username:\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/native/local_user_preset.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Hide
2-
Wait />$/
2+
Wait /^>\n/
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
55
${AUTHD_TEST_TAPE_COMMAND_AUTH_FINAL_WAIT}

‎pam/integration-tests/testdata/tapes/native/passwd_auth_fail.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username:$/
5+
Wait /Username:\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/native/passwd_bad_password.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username:$/
5+
Wait /Username:\n/
66
Show
77

88
Hide

‎pam/integration-tests/testdata/tapes/native/passwd_local_broker.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Hide
22
Wait
33
Type "${AUTHD_TEST_TAPE_COMMAND}"
44
Enter
5-
Wait /Username:$/
5+
Wait /Username:\n/
66
Show
77

88
Hide

0 commit comments

Comments
 (0)