summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-09-20 17:51:46 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-20 19:47:09 -0400
commitf5579605c4905dc71e8605081ba0263563f6926e (patch)
tree7efab2db265f4f28c5e951f5cd7cf9136c0b8493
parent04e19184499dfa6a9ca49dc8324175cfe29e65b8 (diff)
[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)
-rw-r--r--pkg/requirements-testing.pip1
-rw-r--r--src/leap/bitmask/util.py34
-rw-r--r--tox.ini11
3 files changed, 26 insertions, 20 deletions
diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip
index 0a68f0b..fdecff3 100644
--- a/pkg/requirements-testing.pip
+++ b/pkg/requirements-testing.pip
@@ -5,4 +5,5 @@ coverage
pytest
pytest-pep8
pytest-cov
+pytest-pdb
setuptools-trial
diff --git a/src/leap/bitmask/util.py b/src/leap/bitmask/util.py
index 272334b..3a99e13 100644
--- a/src/leap/bitmask/util.py
+++ b/src/leap/bitmask/util.py
@@ -22,7 +22,8 @@ import platform
import sys
from twisted.python import log
-from twisted.python.procutils import which
+
+from leap.common.files import which
STANDALONE = getattr(sys, 'frozen', False)
@@ -49,20 +50,6 @@ def get_gpg_bin_path():
"""
gpgbin = None
- # During the transition towards gpg2, we can look for /usr/bin/gpg1
- # binary, in case it was renamed using dpkg-divert or manually.
- # We could just pick gpg2, but we need to solve #7564 first.
- try:
- gpgbin_options = which("gpg1")
- for opt in gpgbin_options:
- if not os.path.islink(opt):
- gpgbin = opt
- break
- except IndexError as e:
- log.msg("Couldn't find the gpg1 binary!: %s" % (e,))
- if gpgbin is not None:
- return gpgbin
-
if STANDALONE:
gpgbin = os.path.join(
get_path_prefix(), "..", "apps", "mail", "gpg")
@@ -70,7 +57,7 @@ def get_gpg_bin_path():
gpgbin += ".exe"
else:
try:
- gpgbin_options = which("gpg")
+ gpgbin_options = which("gpg", path_extension='/usr/bin/')
# gnupg checks that the path to the binary is not a
# symlink, so we need to filter those and come up with
# just one option.
@@ -85,6 +72,21 @@ def get_gpg_bin_path():
gpgbin = os.path.abspath(
os.path.join(here(), "apps", "mail", "gpg"))
+ if gpgbin is not None:
+ return gpgbin
+
+ # During the transition towards gpg2, we can look for /usr/bin/gpg1
+ # binary, in case it was renamed using dpkg-divert or manually.
+ # We could just pick gpg2, but we need to solve #7564 first.
+ try:
+ gpgbin_options = which("gpg1")
+ for opt in gpgbin_options:
+ if not os.path.islink(opt):
+ gpgbin = opt
+ break
+ except IndexError as e:
+ log.msg("Couldn't find the gpg1 binary!: %s" % (e,))
+
if gpgbin is None:
log.msg("Could not find gpg1 binary")
return gpgbin
diff --git a/tox.ini b/tox.ini
index 07c04b1..90a8a4a 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