Skip to content

Commit 08a524c

Browse files
committed
get test010 working (old issue 362 test)
1 parent 6755702 commit 08a524c

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

irods/test/scripts/iinit.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../docker-testing/iinit.py

irods/test/scripts/test010_issue_362_rogue_chars_in_pam_password.bats

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,30 @@
66
. $BATS_TEST_DIRNAME/test_support_functions
77

88
setup() {
9-
10-
iinit_as_rods
11-
12-
setup_pam_login_for_user "test123" alice
13-
14-
cat >~/test_get_home_coll.py <<-EOF
9+
[ -f /tmp/once ] || {
10+
rm -fr ~/.irods
11+
$BATS_TEST_DIRNAME/iinit.py host localhost \
12+
port 1247 \
13+
zone tempZone \
14+
user rods \
15+
password rods \
16+
## Because iRODS 5+ negotiates for SSL automatically:
17+
CLIENT_JSON=~/.irods/irods_environment.json
18+
jq '.["irods_client_server_policy"]="CS_NEG_REFUSE"' >$CLIENT_JSON.$$ <$CLIENT_JSON
19+
mv $CLIENT_JSON.$$ $CLIENT_JSON
20+
21+
setup_pam_login_for_user "test123" alice
22+
23+
cat >~/test_get_home_coll.py <<-EOF
1524
import irods.test.helpers as h
1625
ses = h.make_session()
1726
home_coll = h.home_collection(ses)
1827
exit(0 if ses.collections.get(home_coll).path == home_coll
1928
and ses.pool.account._original_authentication_scheme.lower() in ('pam','pam_password')
2029
else 1)
2130
EOF
22-
}
23-
24-
teardown() {
25-
iinit_as_rods
26-
finalize_pam_login_for_user alice
31+
}
32+
touch /tmp/once
2733
}
2834

2935
prc_test()

0 commit comments

Comments
 (0)