The benchmark module sets a log destination of stderr which causes ma…

…sses of spew in the subsequent flocker tests....run the tests for flocker, admin and benchmark in separate containers.
ClusterHQ · Dec 8, 2016 · 0378f76 · 0378f76
1 parent fc8bcd0
commit 0378f76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,9 @@ install:
   - pip install tox awscli
 
 env:
-  - FLOCKER_BUILDER=py27
+  - FLOCKER_BUILDER=test-admin
+  - FLOCKER_BUILDER=test-benchmark
+  - FLOCKER_BUILDER=test-flocker
   - FLOCKER_BUILDER=lint
   - FLOCKER_BUILDER=docs-lint
   - FLOCKER_BUILDER=docs-spelling

diff --git a/.travis/script b/.travis/script
@@ -20,7 +20,9 @@ def tox(tox_env):
 
 
 BUILDERS = {
-    "py27": tox,
+    "test-admin": tox,
+    "test-benchmark": tox,
+    "test-flocker": tox,
     "lint": tox,
     "docs-lint": tox,
     "docs-spelling": tox,

diff --git a/tox.ini b/tox.ini
@@ -11,9 +11,17 @@ setenv =
 deps =
     --requirement=requirements/all.txt
 
-[testenv:py27]
+[testenv:test-admin]
 commands =
-    trial --reporter text --rterrors {posargs:admin benchmark flocker}
+    trial --rterrors {posargs:admin}
+
+[testenv:test-benchmark]
+commands =
+    trial --rterrors {posargs:benchmark}
+
+[testenv:test-flocker]
+commands =
+    trial --rterrors {posargs:flocker}
 
 [testenv:lint]
 # ``ignore_errors`` allows both commands to run.