From 61fe6b1ed3f8a42eb22e12168c88212e55b9095e Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 21 Nov 2013 19:27:06 -0200
Subject: Remove tests dependency on nose2. Closes #4258.

---
 common/pkg/requirements-testing.pip | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'common/pkg')

diff --git a/common/pkg/requirements-testing.pip b/common/pkg/requirements-testing.pip
index 6ff52ff9..9302450c 100644
--- a/common/pkg/requirements-testing.pip
+++ b/common/pkg/requirements-testing.pip
@@ -1,10 +1,5 @@
 mock
-nose2
 testscenarios
 leap.common
 leap.soledad.server
 leap.soledad.client
-
-# Under quarantine...
-# I've been able to run all tests with six==1.3 -- kali
-# six==1.1.0  # some tests are incompatible with newer versions of six.
-- 
cgit v1.2.3


From 8807335119d43c24f5d18c9fa69ad0f9f6e458f2 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 5 Dec 2013 10:11:23 -0400
Subject: add venwrapper script for tests

---
 common/pkg/tools/with_venvwrapper.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 common/pkg/tools/with_venvwrapper.sh

(limited to 'common/pkg')

diff --git a/common/pkg/tools/with_venvwrapper.sh b/common/pkg/tools/with_venvwrapper.sh
new file mode 100755
index 00000000..b62bc10f
--- /dev/null
+++ b/common/pkg/tools/with_venvwrapper.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+#Wraps a command in a virtualenwrapper passed as first argument.
+#Example:
+#with_virtualenvwrapper.sh leap-bitmask ./run_tests.sh
+
+wd=`pwd`
+alias pyver='python -c "import $1;print $1.__path__[0]; print $1.__version__;"'
+
+source `which virtualenvwrapper.sh`
+echo "Activating virtualenv " $1
+echo "------------------------------------"
+workon $1
+cd $wd
+echo "running version: "
+echo `pyver leap.bitmask`
+echo `pyver leap.soledad.common`
+echo `pyver leap.keymanager`
+$2 $3 $4 $5
-- 
cgit v1.2.3