File tree Expand file tree Collapse file tree 2 files changed +22
-16
lines changed Expand file tree Collapse file tree 2 files changed +22
-16
lines changed Original file line number Diff line number Diff line change @@ -34,33 +34,18 @@ testscript=${1}
34
34
testscript_abspath=$( realpath " $testscript " )
35
35
DIR=$( dirname $0 )
36
36
cd $DIR
37
+ . ./test_script_parameters
37
38
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
- )
45
39
image_basename=$( basename $testscript )
46
40
image=${images[$image_basename]}
47
41
48
- declare -A user=(
49
- )
50
-
51
42
if [ -z " $RUN_AS_USER " ]; then
52
43
RUN_AS_USER=${user[$image_basename]}
53
44
fi
54
45
55
46
# Tests are run as testuser by default
56
47
: ${RUN_AS_USER:= ' testuser' }
57
48
58
- declare -A workdirs=(
59
- [testuser]=/home/testuser
60
- [irods]=/var/lib/irods
61
- [root]=/
62
- )
63
-
64
49
WORKDIR=" "
65
50
if [ -n " $EXPLICIT_WORKDIR " ]; then
66
51
WORKDIR=" $EXPLICIT_WORKDIR "
Original file line number Diff line number Diff line change
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
+ )
You can’t perform that action at this time.
0 commit comments