浏览代码

Make script/test use Docker

Really easy to run entire test suite with Docker now. Also switch
Wercker to use the same script.

Signed-off-by: Ben Firshman <[email protected]>
Ben Firshman 11 年之前
父节点
当前提交
a3f70a9f64
共有 2 个文件被更改,包括 5 次插入10 次删除
  1. 4 3
      script/test
  2. 1 7
      wercker.yml

+ 4 - 3
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 $@

+ 1 - 7
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