From 596132292aee59c291f4086be554934ead50a4c8 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sun, 12 Jul 2015 15:07:25 +0000
Subject: [PATCH] Travis: test Python 3.4.

---
 .travis.yml | 8 ++++----
 tox.ini     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7b03d20a..a771c372d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,15 +12,15 @@ env:
   global:
     - GOPATH=/tmp/go
   matrix:
-    - TOXENV=py26
-    - TOXENV=py27
+    - TOXENV=py26 BOULDER_INTEGRATION=1
+    - TOXENV=py27 BOULDER_INTEGRATION=1
+    - TOXENV=py34
     - TOXENV=lint
     - TOXENV=cover
 
 install: "travis_retry pip install tox coveralls"
 before_script: '[ "${TOXENV:0:2}" != "py" ] || ./tests/boulder-start.sh'
-# TODO: eliminate substring slice bashism
-script: 'travis_retry tox && ([ "${TOXENV:0:2}" != "py" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))'
+script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))'
 
 after_success: '[ "$TOXENV" == "cover" ] && coveralls'
 
diff --git a/tox.ini b/tox.ini
index 9d5ccf49c..a2d4fbde7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ setenv =
 [testenv:py34]
 commands =
     pip install -e acme[testing]
-    nosetests acme/acme
+    nosetests acme
 
 [testenv:cover]
 basepython = python2.7