Fix connection salt master-minion checking state.event #4261
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jknphy
changed the title
okurz
reviewed
Jan 24, 2018
tests/console/salt.pm
Outdated
| @@ -29,11 +29,12 @@ systemctl start salt-minion | |||
| systemctl status --no-pager salt-minion | |||
| EOF | |||
| assert_script_run($_) foreach (split /\n/, $cmd); | |||
| record_soft_failure 'bsc#1069711'; # Added 30s wait for public key from minion present in master | |||
| sleep(30); | |||
| # before accepting the key, wait the minion is fully started (systemd might be not reliable) | |||
tests/console/salt.pm
Outdated
| record_soft_failure 'bsc#1069711'; # Added 30s wait for public key from minion present in master | ||
| sleep(30); | ||
| # before accepting the key, wait the minion is fully started (systemd might be not reliable) | ||
| assert_script_run("salt-run state.event tagmatch=\"salt/auth\" quiet=True count=1"); |
There was a problem hiding this comment.
I guess single ticks should help here:
assert_script_run 'salt-run state.event tagmatch="salt/auth" quiet=True count=1';
tests/console/salt.pm
Outdated
| record_soft_failure 'bsc#1069711'; # Added 180s to ping minion | ||
| validate_script_output "salt '*' test.ping -t 180 | grep -woh True > /dev/$serialdev", sub { m/True/ }, 190; | ||
| # before pinging the minions, check the start event is a signal that the minion is now ready | ||
| assert_script_run("salt-run state.event tagmatch=\"salt/minion/*/start\" quiet=True count=1"); |
tests/console/salt.pm
Outdated
| validate_script_output "salt '*' test.ping -t 180 | grep -woh True > /dev/$serialdev", sub { m/True/ }, 190; | ||
| # before pinging the minions, check the start event is a signal that the minion is now ready | ||
| assert_script_run("salt-run state.event tagmatch=\"salt/minion/*/start\" quiet=True count=1"); | ||
| validate_script_output "salt '*' test.ping | grep -woh True > /dev/$serialdev", sub { m/True/ }; |
There was a problem hiding this comment.
I wonder why we use validate_script_output here. If grep does not find "True" it will return false anyway so what should suffice:
assert_script_run "salt '*' test.ping | grep -wo True";
|
The test just passed the salt module successfully in http://dhcp227/tests/301#step/salt/26 so your code did not break it. If it fixes the problem we should see by running the failing scenarios at least 10 times. At best you do it in local verification but we can also do it in production. Please consider my comments first though. |
|
VR with changes: http://dhcp227/tests/303#step/salt/31 |
jknphy
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix connection salt master-minion checking state.event