Skip to content

Commit c14719e

Browse files
committed
skip test if server not latest version
1 parent 0cd5e2b commit c14719e

3 files changed

Lines changed: 18 additions & 0 deletions

File tree

irods/test/scripts/test011_pam_interactive.bats

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ setup() {
1919
jq '.irods_client_server_policy="CS_NEG_REFUSE"' >$CLIENT_JSON.$$ <$CLIENT_JSON && \
2020
mv $CLIENT_JSON.$$ $CLIENT_JSON
2121

22+
# if plugin installation would upgrade server, then skip test.
23+
if irods_server_package_upgradable; then
24+
skip
25+
fi
26+
2227
sudo apt install -y irods-auth-plugin-pam-interactive-{client,server}
2328

2429
setup_pam_login_for_user "rods" alice

irods/test/scripts/test012_pam_interactive_multistep.bats

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ setup() {
3333
jq '.irods_client_server_policy="CS_NEG_REFUSE"' >$CLIENT_JSON.$$ <$CLIENT_JSON && \
3434
mv $CLIENT_JSON.$$ $CLIENT_JSON
3535

36+
# if plugin installation would upgrade server, then skip test.
37+
if irods_server_package_upgradable; then
38+
skip
39+
fi
40+
3641
sudo apt install -y irods-auth-plugin-pam-interactive-{client,server}
3742
SERVER_CONFIG=server_config.json
3843

irods/test/scripts/test_support_functions

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,11 @@ if relto:
242242
print(fm_tuple(svt))
243243
" $1 $2
244244
}
245+
246+
irods_server_package_upgradable() {
247+
apt update >& /dev/null
248+
if { apt list --upgradable | grep "irods-server"; } >&/dev/null; then
249+
return 0
250+
fi
251+
return 1
252+
}

0 commit comments

Comments
 (0)