From c2b1ea4e8cfbcaa511918753fedd023a735a027e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 4 May 2017 17:29:35 -0700 Subject: [PATCH] Use test3 not test1 for FreeIPA password change test module Previously this module changed test1's password, so that it would still be able to work even if the webui test module failed (so test3/test4 didn't get created). But this means that, for about 30 seconds, test1's password is 'loremipsum' not 'batterystaple', and if one of the *other* client test jobs happens to hit a point where it has to auth as test1 during the 30 seconds test1's password is different, it will fail. This looks to be what happened to the join_kickstart test the last few days - it failed because it tried to login as test1 during the password change window. By using the test3 user instead (which is only used by the join_cockpit test, currently) we avoid this problem, at the cost that the password_change module will always fail if the webui module fails. --- tests/freeipa_password_change.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/freeipa_password_change.pm b/tests/freeipa_password_change.pm index f010a688..ed67cc63 100644 --- a/tests/freeipa_password_change.pm +++ b/tests/freeipa_password_change.pm @@ -11,7 +11,11 @@ sub run { assert_script_run 'rm -rf /root/.mozilla'; # clear kerberos ticket so we don't auto-auth as 'test4' assert_script_run 'kdestroy -A'; - start_webui("test1", "batterystaple"); + # we use test3 for this test; this means it'll fail if the webUI + # test fails before creating test3 and setting its password, but + # changing test1's password can cause other client tests to fail + # if they try and auth as test1 while it's changed + start_webui("test3", "batterystaple"); assert_and_click "freeipa_webui_actions"; assert_and_click "freeipa_webui_reset_password_link"; wait_still_screen 3; @@ -34,13 +38,15 @@ sub run { # finishing (and handing off to freeipa_client_postinstall) wait_still_screen 5; # check we can kinit with changed password - assert_script_run 'printf "loremipsum" | kinit test1'; + assert_script_run 'printf "loremipsum" | kinit test3'; # change password via CLI (back to batterystaple, as that's what # freeipa_client test expects) assert_script_run 'dnf -y install freeipa-admintools'; - assert_script_run 'printf "batterystaple\nbatterystaple" | ipa user-mod test1 --password'; + assert_script_run 'printf "batterystaple\nbatterystaple" | ipa user-mod test3 --password'; # check we can kinit again - assert_script_run 'printf "batterystaple" | kinit test1'; + assert_script_run 'printf "batterystaple" | kinit test3'; + # clear kerberos ticket for freeipa_client test + assert_script_run 'kdestroy -A'; # we just stay here - freeipa_client will pick right up }