diff options
| author | Will Dietz <github@wdtz.org> | 2018-07-20 10:55:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 10:55:28 -0500 |
| commit | 5f5e3434874c6757504cbd5d48c02678e9851913 (patch) | |
| tree | 7aa1d22bda95af08dd7eec9907862819ff9a6631 | |
| parent | b5b23b39bebb8f4efe9d2448a10ab9bbfef62683 (diff) | |
| parent | b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8 (diff) | |
| download | nixlib-5f5e3434874c6757504cbd5d48c02678e9851913.tar nixlib-5f5e3434874c6757504cbd5d48c02678e9851913.tar.gz nixlib-5f5e3434874c6757504cbd5d48c02678e9851913.tar.bz2 nixlib-5f5e3434874c6757504cbd5d48c02678e9851913.tar.lz nixlib-5f5e3434874c6757504cbd5d48c02678e9851913.tar.xz nixlib-5f5e3434874c6757504cbd5d48c02678e9851913.tar.zst nixlib-5f5e3434874c6757504cbd5d48c02678e9851913.zip | |
Merge pull request #43854 from dtzWill/fix/python-zconfig-musl
python3Packages.zconfig: remove test that relies on setlocale failing
| -rw-r--r-- | pkgs/development/python-modules/zconfig/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/python-modules/zconfig/remove-setlocale-test.patch | 24 |
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 + |