From b09435ea51caaae1865e667aaa32f7cba4cc4ff2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 26 Nov 2016 00:34:41 +0100 Subject: [PATCH] pythonPackages.magic-wormhole: enable tests --- .../python-modules/magic-wormhole/default.nix | 32 ++++++++++++------- pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 304476c26a8d..483e9aa3a3b9 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -1,7 +1,6 @@ -{ fetchurl, lib, buildPythonPackage, python, autobahn -, cffi, click, hkdf, pynacl, spake2, tqdm }: +{ stdenv, fetchurl, nettools, glibcLocales, pythonPackages }: -buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "magic-wormhole-${version}"; version = "0.8.1"; @@ -9,18 +8,29 @@ buildPythonPackage rec { url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz"; sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; }; - checkPhase = '' - ${python.interpreter} -m wormhole.test.run_trial wormhole + + buildInputs = [ nettools glibcLocales ]; + propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ]; + + patchPhase = '' + sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py + sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py + # XXX: disable one test due to warning: + # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py ''; - # Several test failures, network related. - doCheck = false; + checkPhase = '' + export PATH="$PATH:$out/bin" + export LANG="en_US.UTF-8" + export LC_ALL="en_US.UTF-8" + ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole + ''; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ]; - meta = { + meta = with stdenv.lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ asymmetric ]; + license = licenses.mit; + maintainers = with maintainers; [ asymmetric ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b94b6eeae50..0d19e2d77800 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26273,7 +26273,9 @@ in { }; }); - magic-wormhole = callPackage ../development/python-modules/magic-wormhole {}; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { + pythonPackages = self; + }; wsgiproxy2 = buildPythonPackage rec { name = "WSGIProxy2-0.4.2";