about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-07-20 10:15:55 -0500
committerWill Dietz <w@wdtz.org>2018-07-20 10:15:55 -0500
commitb97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8 (patch)
tree85631c7b0d9cd89abfb47b7aa8cf8cafc5c14a3b
parent491f20533236798e45d9e40ee41c6577f818942d (diff)
downloadnixlib-b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8.tar
nixlib-b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8.tar.gz
nixlib-b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8.tar.bz2
nixlib-b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8.tar.lz
nixlib-b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8.tar.xz
nixlib-b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8.tar.zst
nixlib-b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8.zip
python3Packages.zconfig: remove test that relies on setlocale failing
-rw-r--r--pkgs/development/python-modules/zconfig/default.nix3
-rw-r--r--pkgs/development/python-modules/zconfig/remove-setlocale-test.patch24
2 files changed, 26 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index f8f933b96abb..79f6ddca5434 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -15,7 +15,8 @@ buildPythonPackage rec {
     sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19";
   };
 
-  patches = [ ./skip-broken-test.patch ];
+  patches = [ ./skip-broken-test.patch ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
 
   buildInputs = [ manuel docutils ];
   propagatedBuildInputs = [ zope_testrunner ];
diff --git a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
new file mode 100644
index 000000000000..6b3d3266b21b
--- /dev/null
+++ b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
@@ -0,0 +1,24 @@
+From 43fd87037be1c98b6afa20f179f2e2d8ef5491ba Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Fri, 20 Jul 2018 10:07:22 -0500
+Subject: [PATCH] remove test that fails w/musl (setlocale() always succeeds)
+
+---
+ ZConfig/tests/test_datatypes.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ZConfig/tests/test_datatypes.py b/ZConfig/tests/test_datatypes.py
+index 7c8d80c..addecd2 100644
+--- a/ZConfig/tests/test_datatypes.py
++++ b/ZConfig/tests/test_datatypes.py
+@@ -229,7 +229,6 @@ class DatatypeTestCase(unittest.TestCase):
+         convert = self.types.get("locale")
+         # Python supports "C" even when the _locale module is not available
+         self.assertEqual(convert("C"), "C")
+-        self.assertRaises(ValueError, convert, "locale-does-not-exist")
+ 
+     def test_datatype_port(self):
+         convert = self.types.get("port-number")
+-- 
+2.18.0
+