From 329b6b5abfb6562d57f8f1c317f8e86a042f676d Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Fri, 13 Dec 2013 04:06:59 +0100
Subject: [PATCH] travis: do not run dnstools tests in parallel

also: only run coverage and pep8 once
---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c7240ee..83e9f14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,19 @@ env:
       - SECRET_KEY=justfortravis
       - DNS_RESOLVER_TIMEOUT=15.0
       - DNS_UPDATE_TIMEOUT=30.0
+      - TEST_OPTS="-k 'not dnstools and not ddns_client'"
+      - COVERAGE=""
     matrix:
       - DJANGO=1.5.5
       - DJANGO=1.6.1
+      include:
+        - python: "2.7"
+          env: DJANGO=1.6.1 COVERAGE="coverage run -m" TEST_OPTS="--pep8"
 install:
     - "pip install --use-mirrors Django==$DJANGO"
     - "pip install --use-mirrors -e ."
     - "pip install --use-mirrors coveralls"
-script: "coverage run -m py.test --pep8"
+script: "$COVERAGE py.test $TEST_OPTS"
 after_success:
     - coveralls
 notifications: