dev-python/pyopenssl: Fix running tests and re-enable them

diff --git a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
index 2b62b16aff3cffe98822eb1d059a1315cb9291f9..3844222d4315b5f0546fe1c2c184f22fcbcac218 100644 (file)
--- a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
@@ -24,19 +24,15 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc examples test"
-RESTRICT="test" # currently pretty broken. tox always tries to fetch stuff from the internet.
 
 RDEPEND="
        >=dev-python/six-1.5.2[${PYTHON_USEDEP}]
        >=dev-python/cryptography-1.3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Test dependencies aren't keyworded for all arches yet.
-#      test? (
-#              >=dev-python/coverage-4.2[${PYTHON_USEDEP}]
-#              dev-python/tox[${PYTHON_USEDEP}]
-#              >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
-#      )"
+       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+       test? (
+               virtual/python-cffi[${PYTHON_USEDEP}]
+               >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -45,9 +41,8 @@ python_compile_all() {
 }
 
 python_test() {
-       tox
-       # https://bugs.launchpad.net/pyopenssl/+bug/1237953
-       rm -rf tmp* *.key *.pem || die
+       # FIXME: for some reason, no-ops on PyPy
+       esetup.py test
 }
 
 python_install_all() {