Merge pull request #506 from bfirsh/make-test-script-use-docker

Make script/test use docker

.travis.yml

@@ -1,12 +0,0 @@
-language: python
-python:
-- '2.6'
-- '2.7'
-install:
-- pip install -r requirements.txt
-- pip install -r requirements-dev.txt
-- pip install .
-script:
- - script/validate-dco
- - flake8 fig
- - nosetests tests/unit

script/test

@@ -1,4 +1,5 @@
 #!/bin/sh
-set -e
-flake8 fig
-PYTHONIOENCODING=ascii nosetests $@
+set -ex
+docker build -t fig .
+docker run -v /var/run/docker.sock:/var/run/docker.sock fig flake8 fig
+docker run -v /var/run/docker.sock:/var/run/docker.sock fig nosetests $@

script/travis-integration

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -ex
-
-# Kill background processes on exit
-trap 'kill -9 $(jobs -p)' SIGINT SIGTERM EXIT
-
-export DOCKER_HOST=tcp://localhost:4243
-orchard proxy -H $TRAVIS_JOB_ID $DOCKER_HOST &
-sleep 2
-nosetests -v

wercker.yml

@@ -4,12 +4,6 @@ build:
     - script:
         name: validate DCO
         code: script/validate-dco
-    - script:
-        name: build
-        code: docker build -t fig .
-    - script:
-        name: flake8
-        code: docker run -v /var/run/docker.sock:/var/run/docker.sock fig flake8 fig
     - script:
         name: run tests
-        code: docker run -v /var/run/docker.sock:/var/run/docker.sock fig nosetests
+        code: script/test