Skip to content

Commit d41cf5b

Browse files
committed
move to test-script-parameters
1 parent 0773274 commit d41cf5b

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

irods/test/harness/docker_container_driver.sh

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,18 @@ testscript=${1}
3434
testscript_abspath=$(realpath "$testscript")
3535
DIR=$(dirname $0)
3636
cd $DIR
37+
. ./test_script_parameters
3738

38-
declare -A images=(
39-
[test_1.sh]=install-irods
40-
[test_2.sh]=bats-python3
41-
[test_3.bats]=bats-python3
42-
[experiment.sh]=ssl-and-pam
43-
[fail.sh]=ssl-and-pam
44-
)
4539
image_basename=$(basename $testscript)
4640
image=${images[$image_basename]}
4741

48-
declare -A user=(
49-
)
50-
5142
if [ -z "$RUN_AS_USER" ]; then
5243
RUN_AS_USER=${user[$image_basename]}
5344
fi
5445

5546
# Tests are run as testuser by default
5647
: ${RUN_AS_USER:='testuser'}
5748

58-
declare -A workdirs=(
59-
[testuser]=/home/testuser
60-
[irods]=/var/lib/irods
61-
[root]=/
62-
)
63-
6449
WORKDIR=""
6550
if [ -n "$EXPLICIT_WORKDIR" ]; then
6651
WORKDIR="$EXPLICIT_WORKDIR"
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
declare -A images=(
3+
[test_1.sh]=install-irods
4+
[test_2.sh]=bats-python3
5+
[test_3.bats]=bats-python3
6+
[experiment.sh]=ssl-and-pam
7+
[fail.sh]=ssl-and-pam
8+
)
9+
10+
declare -A user=(
11+
)
12+
13+
declare -A workdirs=(
14+
[testuser]=/home/testuser
15+
[irods]=/var/lib/irods
16+
[root]=/
17+
)
18+
19+
declare -A wrappers=(
20+
[login_auth_test.py]=./login_auth_test.sh
21+
)

0 commit comments

Comments
 (0)