Merging dev into main. #4
Merged
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
added 2 commits
February 19, 2024 13:25
* Improving & streamlining tests * Adding some more sanity checks validating restarted services
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -28,12 +29,22 @@ echo -e "=========================== ${YELLOW}$TEST_NAME${COLOR_OFF} started "== | |||
|
|
|||
| . $UUT | |||
| # We're testing here sourced bash scripts, global variables keep their values in between tests. | ||
| # reset_test_environment resets them so every test starts from a clean state | ||
| reset_test_environment() { | ||
| SERVICES=() |
| # reset_test_environment resets them so every test starts from a clean state | ||
| reset_test_environment() { | ||
| SERVICES=() | ||
| BLOCKED_SERVICES=() |
| reset_test_environment() { | ||
| SERVICES=() | ||
| BLOCKED_SERVICES=() | ||
| PRE_RESTART_HEALTHY="0" |
| SERVICES=() | ||
| BLOCKED_SERVICES=() | ||
| PRE_RESTART_HEALTHY="0" | ||
| POST_RESTART_HEALTHY="0" |
| SYS_RESTART_FAILED=0 count_pre_restart_health | ||
| OS_VERSION="2023" NEED_RESTART_1=1 SYS_RESTART_FAILED=1 generate_reboot_hint_marker || retval=$? | ||
|
|
||
| if [[ $retval == 2 && -f "$(pwd)/reboot-hint-marker" ]]; then |
| SYS_RESTART_FAILED=0 count_pre_restart_health | ||
| OS_VERSION="2023" NEED_RESTART_1=1 SYS_RESTART_FAILED=1 generate_reboot_hint_marker || retval=$? | ||
|
|
||
| if [[ $retval == 2 && -f "$(pwd)/reboot-hint-marker" ]]; then |
| SYS_RESTART_FAILED=0 count_pre_restart_health | ||
| OS_VERSION="2023" NEED_RESTART_1=1 SYS_RESTART_FAILED=1 generate_reboot_hint_marker || retval=$? | ||
|
|
||
| if [[ $retval == 2 && -f "$(pwd)/reboot-hint-marker" ]]; then |
| OS_VERSION="2023" NEED_RESTART_1=1 SYS_RESTART_FAILED=1 generate_reboot_hint_marker || retval=$? | ||
|
|
||
| if [[ $retval == 2 && -f "$(pwd)/reboot-hint-marker" ]]; then | ||
| PASSED "$DESCRIPTION" |
| if [[ $retval == 2 && -f "$(pwd)/reboot-hint-marker" ]]; then | ||
| PASSED "$DESCRIPTION" | ||
| else | ||
| FAILED "$DESCRIPTION (error: $retval)" |
| local all_services=($($NEEDS_RESTARTING_COMMAND -s | xargs)) | ||
|
|
||
| # shellcheck disable=SC2048 | ||
| BLOCKED_SERVICES=("$(sed "s/#.*//g" ${DENYLISTS[*]})") |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| BLOCKED_SERVICES=("$(sed "s/#.*//g" ${DENYLISTS[*]})") | |
| BLOCKED_SERVICES=("$(sed "s/#.*//g" "${DENYLISTS[*]}")") |
| if [[ "$PRE_RESTART_HEALTHY" != "$POST_RESTART_HEALTHY" ]]; then | ||
| S=() | ||
| for SERVICE in "${SERVICES[@]}"; do | ||
| $SYSCTL_COMMAND is-active ${SERVICE} |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| $SYSCTL_COMMAND is-active ${SERVICE} | |
| $SYSCTL_COMMAND is-active "${SERVICE}" |
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.
Merging changes proposed offline into main.