From bb82515bca6ff6e6b74718bf946faf3747e40002 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Wed, 21 Sep 2016 10:45:09 -0400
Subject: [tests] add editable externals to git repo

---
 .gitlab-ci.yml             |  2 +-
 pkg/tools/checkout_leap.sh |  2 +-
 tox.ini                    | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdcd83b8..ae1b1130 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,2 +1,2 @@
 test:
-    script: pkg/tools/checkout_leap.sh && tox --recreate -e py27-dev
+    script: tox --recreate -e py27-dev
diff --git a/pkg/tools/checkout_leap.sh b/pkg/tools/checkout_leap.sh
index 082ff8f0..cdcb90e9 100755
--- a/pkg/tools/checkout_leap.sh
+++ b/pkg/tools/checkout_leap.sh
@@ -5,5 +5,5 @@ fi
 if [ ! -d "../soledaddev" ]; then
 	git clone https://github.com/leapcode/soledad ../soledaddev
 fi
-cd ../leap_commondev && git checkout develop && git pull origin develop
+cd ../leap_commondev && git checkout master && git pull origin master
 cd ../soledaddev && git checkout develop && git pull origin develop
diff --git a/tox.ini b/tox.ini
index 0eef22c6..cea73b29 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,9 +17,22 @@ setenv =
     HOME=/tmp
 
 [testenv:py27-dev]
+commands =
+    py.test -k 'not bench' --pep8 -x {posargs}
+deps =
+    -r{toxinidir}/pkg/requirements-testing.pip
+    gnupg
+    -egit+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common
+    -egit+https://0xacab.org/leap/soledad@develop#egg=leap.soledad.common&subdirectory=common
+    -egit+https://0xacab.org/leap/soledad@develop#egg=leap.soledad.client&subdirectory=client
+setenv =
+    HOME=/tmp
+    PATH=/usr/bin/:/bin/
+
+[testenv:py27-dev-local]
 # This environment assumes leap_common and soledad repos 
-# are in the parent folder.
-# Use pkg/tools/checkout_leap.sh script to checkout those.
+# are checked out locally in the parent folder.
+# Use pkg/tools/checkout_leap.sh script to do that.
 commands =
     py.test -k 'not bench' --pep8 -x {posargs}
 deps =
@@ -32,6 +45,7 @@ setenv =
     HOME=/tmp
     PATH=/usr/bin/:/bin/
   
+  
 [testenv:py27-bench]
 commands = py.test {posargs}
 changedir = bench
-- 
cgit v1.2.3