From f4075046797a2f74eb625407742f31f10a74663c Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 30 Sep 2014 13:47:47 -0700
Subject: [PATCH 1/2] Remove old Travis files

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 .travis.yml               | 12 ------------
 script/travis-integration | 10 ----------
 2 files changed, 22 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100755 script/travis-integration

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f61d718e..00000000
--- a/.travis.yml
+++ /dev/null
@@ -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
diff --git a/script/travis-integration b/script/travis-integration
deleted file mode 100755
index c0ff5b4b..00000000
--- a/script/travis-integration
+++ /dev/null
@@ -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

From a3f70a9f6400dd1a865376bc348a0b051860c43e Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 30 Sep 2014 13:48:01 -0700
Subject: [PATCH 2/2] 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 <ben@firshman.co.uk>
---
 script/test | 7 ++++---
 wercker.yml | 8 +-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/script/test b/script/test
index 1fd7d2ca..79cc7e6b 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 b013c2a4..6ab2d95e 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