From f5579605c4905dc71e8605081ba0263563f6926e Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 20 Sep 2016 17:51:46 -0400
Subject: [bug] revert usage of twisted which

the test environment isn't finding the path properly, due to pytest
internals.

so:

- add path extension
- fix the order in which we're happy with a gpg option (to avoid symlinks)
---
 tox.ini | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 07c04b12..90a8a4af 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
 envlist = py27
+skipsdist=True
 
 [testenv]
 commands = py.test --cov-report=html \
@@ -7,11 +8,11 @@ commands = py.test --cov-report=html \
 		   --cov=leap.bitmask \
 		   -k 'not bench' \
 		   --pep8 {posargs}
+usedevelop = True
 deps =
     -r{toxinidir}/pkg/requirements-testing.pip
     gnupg
     leap.soledad.client
-    -e.
 setenv =
     HOME=/tmp
 
@@ -20,15 +21,17 @@ setenv =
 # are in the parent folder.
 # Use pkg/tools/checkout_leap.sh script to checkout those.
 commands =
-    py.test -k 'not bench' {posargs}
+    py.test -k 'not bench' -x {posargs}
 deps =
     -r{toxinidir}/pkg/requirements-testing.pip
     gnupg
     -e../leap_commondev
     -e../soledaddev/common
     -e../soledaddev/client
-    -e.
-
+setenv =
+    HOME=/tmp
+    PATH=/usr/bin/:/bin/
+  
 [testenv:py27-bench]
 commands = py.test {posargs}
 changedir = bench
-- 
cgit v1.2.3