test for standalone images

Author: WillAbides

Makefile

@@ -27,7 +27,7 @@ generate_standalone_firefox:
 	cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION)
 
 standalone_firefox: generate_standalone_firefox firefox
-  cd ./StandaloneFirefox && docker build -t $(NAME)/standalone-firefox:$(VERSION) .
+	cd ./StandaloneFirefox && docker build -t $(NAME)/standalone-firefox:$(VERSION) .
 
 generate_standalone_chrome:
 	cd ./Standalone && ./generate.sh StandaloneChrome node-chrome Chrome $(VERSION)
@@ -53,22 +53,29 @@ tag_latest:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:latest
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:latest
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:latest
+	docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:latest
+	docker tag $(NAME)/standalone-firefox:$(VERSION) $(NAME)/standalone-firefox:latest
 
 release: tag_latest
 	@if ! docker images $(NAME)/base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/hub | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/hub version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-chrome | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-chrome version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-firefox | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-firefox version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	@if ! docker images $(NAME)/standalone-chrome | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/standalone-chrome version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	@if ! docker images $(NAME)/standalone-firefox | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/standalone-firefox version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	docker push $(NAME)/base
 	docker push $(NAME)/hub
 	docker push $(NAME)/node-base
 	docker push $(NAME)/node-chrome
 	docker push $(NAME)/node-firefox
+	docker push $(NAME)/standalone-chrome
+	docker push $(NAME)/standalone-firefox
 	@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"
 
 test:
 	./test.sh
+	./sa-test.sh
 	./test.sh debug
 
 .PHONY: all build ci base hub nodebase chrome firefox \

Test/Dockerfile

@@ -1,4 +1,5 @@
 FROM node:0.10-onbuild
 MAINTAINER Selenium <[email protected]>
 
+ENV TEST_CMD node smoke-chrome.js && node smoke-firefox.js
 # The remainder of this build will be completed by the upstream image's ONBUILD commands

Test/package.json

@@ -4,7 +4,7 @@
   "description": "Tests for docker selenium configuration",
   "main": "index.js",
   "scripts": {
-    "start": "node smoke-chrome.js && node smoke-firefox.js"
+    "start": "$TEST_CMD"
   },
   "license": "Apache 2",
   "dependencies": {

sa-test.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+echo Building test container image
+docker build -t selenium/test:local ./Test
+
+function test_standalone {
+  BROWSER=$1
+  echo Starting $BROWSER standalone container
+
+  SA=$(docker run -d -v /dev/urandom:/dev/random selenium/standalone-$BROWSER:2.44.0)
+  SA_NAME=$(docker inspect -f '{{ .Name  }}' $SA | sed s:/::)
+  TEST_CMD="node smoke-$BROWSER.js"
+
+  echo Running test container...
+  docker run --rm -it --link $SA_NAME:hub -e "TEST_CMD=$TEST_CMD" selenium/test:local
+  STATUS=$?
+
+  echo Tearing down Selenium $BROWSER standalone container
+
+  docker stop $SA_NAME
+  docker rm $SA_NAME
+
+  if [ ! $STATUS == 0 ]; then
+    echo Failed
+    exit 1
+  fi
+}
+
+test_standalone firefox
+test_standalone chrome