Skip to content

Commit 0849604

Browse files
committed
Running the tests agains the generated images in the Travis build, not the latest release.
1 parent ca7b7e8 commit 0849604

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@ release: tag_major_minor
227227
docker push $(NAME)/standalone-firefox-debug:$(MAJOR_MINOR_PATCH)
228228

229229
test:
230-
./test.sh
231-
./sa-test.sh
232-
./test.sh debug
233-
./sa-test.sh debug
230+
VERSION=$(VERSION) ./test.sh
231+
VERSION=$(VERSION) ./sa-test.sh
232+
VERSION=$(VERSION) ./test.sh debug
233+
VERSION=$(VERSION) ./sa-test.sh debug
234234

235235
.PHONY: \
236236
all \

sa-test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env bash
22

33
DEBUG=''
4+
VERSION=${VERSION:-3.4.0-bismuth}
45

56
if [ -n "$1" ] && [ $1 == 'debug' ]; then
67
DEBUG='-debug'
@@ -13,7 +14,7 @@ function test_standalone {
1314
BROWSER=$1
1415
echo Starting Selenium standalone-$BROWSER$DEBUG container
1516

16-
SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:3.4.0-bismuth)
17+
SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:${VERSION})
1718
SA_NAME=$(docker inspect -f '{{ .Name }}' $SA | sed s:/::)
1819
TEST_CMD="node smoke-$BROWSER.js"
1920

test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ echo Building test container image
2424
docker build -t selenium/test:local ./Test
2525

2626
echo 'Starting Selenium Hub Container...'
27-
HUB=$(docker run -d selenium/hub:3.4.0-bismuth)
27+
HUB=$(docker run -d selenium/hub:${VERSION})
2828
HUB_NAME=$(docker inspect -f '{{ .Name }}' $HUB | sed s:/::)
2929
echo 'Waiting for Hub to come online...'
3030
docker logs -f $HUB &

0 commit comments

Comments
 (0)