From a3f70a9f6400dd1a865376bc348a0b051860c43e Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Tue, 30 Sep 2014 13:48:01 -0700 Subject: [PATCH] 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 --- script/test | 7 ++++--- wercker.yml | 8 +------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/script/test b/script/test index 1fd7d2ca4..79cc7e6b2 100755 --- a/script/test +++ b/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 $@ diff --git a/wercker.yml b/wercker.yml index b013c2a41..6ab2d95e9 100644 --- a/wercker.yml +++ b/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