Hint shellcheck that bash is used for all test scripts #13776
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
tomponline
reviewed
Jul 16, 2024
|
Can be rebased now |
bash brings interesting features without being an unreasonable minimum requirement. Besides, `make static-analysis` already uses `shellcheck --shell bash`. Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
simondeziel
force-pushed
the
bash-tests
branch
2 times, most recently
from
362859e
to
90ebbbc
Compare
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
test/suites/clustering.sh
Outdated
| @@ -2132,7 +2111,7 @@ | |||
| ip a add 127.0.1.1"${ipRand}"/32 dev "${prefix}1" | |||
|
|
|||
| # Create forkdns config directory | |||
| mkdir "${lxdDir}"/networks/lxdtest1/forkdns.servers -p | |||
| mkdir "${LXD_DIR}"/networks/lxdtest1/forkdns.servers -p | |||
Check warning
Code scanning / shellcheck
SC2031 Warning
test/suites/clustering.sh
Outdated
| @@ -2144,7 +2123,7 @@ | |||
| ip a add 127.0.1.2"${ipRand}"/32 dev "${prefix}2" | |||
|
|
|||
| # Create forkdns config directory | |||
| mkdir "${lxdDir}"/networks/lxdtest2/forkdns.servers -p | |||
| mkdir "${LXD_DIR}"/networks/lxdtest2/forkdns.servers -p | |||
Check warning
Code scanning / shellcheck
SC2031 Warning
test/suites/clustering.sh
Outdated
| @@ -2154,11 +2133,11 @@ | |||
| sleep 1 | |||
|
|
|||
| # Create servers list file for forkdns1 pointing at forkdns2 (should be live reloaded) | |||
| echo "127.0.1.2${ipRand}" > "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp | |||
| mv "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf | |||
| echo "127.0.1.2${ipRand}" > "${LXD_DIR}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp | |||
Check warning
Code scanning / shellcheck
SC2031 Warning
test/suites/clustering.sh
Outdated
| echo "127.0.1.2${ipRand}" > "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp | ||
| mv "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf | ||
| echo "127.0.1.2${ipRand}" > "${LXD_DIR}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp | ||
| mv "${LXD_DIR}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp "${LXD_DIR}"/networks/lxdtest1/forkdns.servers/servers.conf |
Check warning
Code scanning / shellcheck
SC2031 Warning
test/suites/clustering.sh
Outdated
| echo "127.0.1.2${ipRand}" > "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp | ||
| mv "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp "${lxdDir}"/networks/lxdtest1/forkdns.servers/servers.conf | ||
| echo "127.0.1.2${ipRand}" > "${LXD_DIR}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp | ||
| mv "${LXD_DIR}"/networks/lxdtest1/forkdns.servers/servers.conf.tmp "${LXD_DIR}"/networks/lxdtest1/forkdns.servers/servers.conf |
Check warning
Code scanning / shellcheck
SC2031 Warning
test/suites/clustering.sh
Outdated
|
|
||
| # Create fake DHCP lease file on forkdns2 network | ||
| echo "$(date +%s) 00:16:3e:98:05:40 10.140.78.145 test1 ff:2b:a8:0a:df:00:02:00:00:ab:11:36:ea:11:e5:37:e0:85:45" > "${lxdDir}"/networks/lxdtest2/dnsmasq.leases | ||
| echo "$(date +%s) 00:16:3e:98:05:40 10.140.78.145 test1 ff:2b:a8:0a:df:00:02:00:00:ab:11:36:ea:11:e5:37:e0:85:45" > "${LXD_DIR}"/networks/lxdtest2/dnsmasq.leases |
Check warning
Code scanning / shellcheck
SC2031 Warning
Those are shellcheck: SC2039 and SC3043
This is supported now that we use `bash`. Change done mechanically with:
```
find test/ -type f -name '*.sh' -exec sed -i '/# shellcheck disable=\(SC\)\?2039,\(SC\)\?3043$/d' {} +
```
With manual fix-up.
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
simondeziel
force-pushed
the
bash-tests
branch
3 times, most recently
from
b7b1fce
to
91fc74a
Compare
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
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.
Also, since we are using
bash, stop silencing thelocalis not supported byshas it works now.