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

Make script/test use docker

Author: aanand

.travis.yml

@@ -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/test

@@ -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