File tree Expand file tree Collapse file tree 5 files changed +6
-6
lines changed Expand file tree Collapse file tree 5 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ rm -f /tmp/.X*lock
38
38
env | cut -f 1 -d " =" | sort > asroot
39
39
sudo -E -u seluser -i env | cut -f 1 -d " =" | sort > asseluser
40
40
sudo -E -i -u seluser \
41
- $( for E in $( grep -vxFf asseluser asroot) ; do echo $E =$( eval echo \$ $E ) ; done) \
41
+ " $( for E in $( grep -vxFf asseluser asroot) ; do echo $E =$( eval echo \$ $E ) ; done) " \
42
42
DISPLAY=$DISPLAY \
43
43
xvfb-run -n $SERVERNUM --server-args=" -screen 0 $GEOMETRY -ac +extension RANDR" \
44
44
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ rm -f /tmp/.X*lock
38
38
env | cut -f 1 -d " =" | sort > asroot
39
39
sudo -E -u seluser -i env | cut -f 1 -d " =" | sort > asseluser
40
40
sudo -E -i -u seluser \
41
- $( for E in $( grep -vxFf asseluser asroot) ; do echo $E =$( eval echo \$ $E ) ; done) \
41
+ " $( for E in $( grep -vxFf asseluser asroot) ; do echo $E =$( eval echo \$ $E ) ; done) " \
42
42
DISPLAY=$DISPLAY \
43
43
xvfb-run -n $SERVERNUM --server-args=" -screen 0 $GEOMETRY -ac +extension RANDR" \
44
44
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
23
23
24
24
# Add root environment variables that are not present in the seluser
25
25
# environment to an environment file.
26
- $( for E in $( grep -vxFf asseluser asroot) ; do echo $E =" '${! E} '" >> ~ seluser/selenv; done) \
26
+ " $( for E in $( grep -vxFf asseluser asroot) ; do echo $E =" '${! E} '" >> ~ seluser/selenv; done) " \
27
27
echo " DISPLAY=${DISPLAY} " >> ~ seluser/selenv
28
28
29
29
sudo -E -i -u seluser \
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ function test_standalone {
27
27
exit 1
28
28
fi
29
29
30
- if [ ! " $CIRCLECI " == " true" ]; then
30
+ if [ ! " ${TRAVIS} " == " true" ]; then
31
31
echo Tearing down Selenium standalone-$BROWSER$DEBUG container
32
32
docker stop $SA_NAME
33
33
docker rm $SA_NAME
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ function test_node {
59
59
exit 1
60
60
fi
61
61
62
- if [ ! " $CIRCLECI " == " true" ]; then
62
+ if [ ! " ${TRAVIS} " == " true" ]; then
63
63
echo Removing the test container
64
64
docker rm $TEST_CONTAINER
65
65
fi
@@ -72,7 +72,7 @@ if [ -z $DEBUG ]; then
72
72
test_node phantomjs $DEBUG
73
73
fi
74
74
75
- if [ ! " $CIRCLECI " == " true" ]; then
75
+ if [ ! " ${TRAVIS} " == " true" ]; then
76
76
echo Tearing down Selenium Chrome Node container
77
77
docker stop $NODE_CHROME
78
78
docker rm $NODE_CHROME
You can’t perform that action at this time.
0 commit comments