From ebae0d2027cede030a6c876f9468361dbe2fd065cbd8f17816876dfcd773df94 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Mon, 7 Dec 2020 15:55:27 +0000
Subject: [PATCH] Accepting request 853619 from
 home:mcepl:branches:devel:tools:scm

- Add skip_32bit_tests.patch (gh#MagicStack/immutables#53) to skip tests
  which fail on 32bit architectures.

OBS-URL: https://build.opensuse.org/request/show/853619
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-immutables?expand=0&rev=11
---
 python-immutables.changes |  6 ++++++
 python-immutables.spec    | 13 ++++++-------
 skip_32bit_tests.patch    | 23 +++++++++++++++++++++++
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 skip_32bit_tests.patch

diff --git a/python-immutables.changes b/python-immutables.changes
index 84e948a..9df87ad 100644
--- a/python-immutables.changes
+++ b/python-immutables.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  7 15:34:37 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Add skip_32bit_tests.patch (gh#MagicStack/immutables#53) to skip tests
+  which fail on 32bit architectures.
+
 -------------------------------------------------------------------
 Tue Oct 13 07:42:13 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/python-immutables.spec b/python-immutables.spec
index 1bf8fc8..dec1f1d 100644
--- a/python-immutables.spec
+++ b/python-immutables.spec
@@ -25,6 +25,9 @@ Summary:        Immutable collections for Python
 License:        Apache-2.0
 URL:            https://github.com/MagicStack/immutables
 Source:         https://files.pythonhosted.org/packages/source/i/immutables/immutables-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM skip_32bit_tests.patch gh#MagicStack/immutables#53 mcepl@suse.com
+# skip failing tests on 32bit architectures
+Patch0:         skip_32bit_tests.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -35,7 +38,8 @@ BuildRequires:  python-rpm-macros
 Immutable collections for Python.
 
 %prep
-%setup -q -n immutables-%{version}
+%autosetup -p1 -n immutables-%{version}
+
 sed -i 's/\.system//' setup.py
 
 %build
@@ -49,12 +53,7 @@ export CFLAGS="%{optflags}"
 }
 
 %check
-# Fails on 32bit for some reason
-%ifarch %ix86
-rm -v tests/test_none_keys.py
-%endif
-
-%python_exec setup.py test
+%pyunittest discover -v
 
 %files %{python_files}
 %doc README.rst
diff --git a/skip_32bit_tests.patch b/skip_32bit_tests.patch
new file mode 100644
index 0000000..20907aa
--- /dev/null
+++ b/skip_32bit_tests.patch
@@ -0,0 +1,23 @@
+--- a/tests/test_none_keys.py
++++ b/tests/test_none_keys.py
+@@ -1,8 +1,10 @@
++import sys
+ import unittest
+ 
+ from immutables.map import map_hash, map_mask, Map as PyMap
+-from immutables._testutils import *  # NoQA
++from immutables._testutils import HashKey  # NoQA
+ 
++is_32bits = sys.maxsize <= 2**32  # 32bit-dness
+ 
+ none_hash = map_hash(None)
+ assert(none_hash != 1)
+@@ -35,6 +37,8 @@ class NoneCollision(HashKey):
+ class BaseNoneTest:
+     Map = None
+ 
++    @unittest.skipIf(is_32bits,
++                     "fail on 32bit arch, gh#MagicStack/immutables#53")
+     def test_none_collisions(self):
+         collisions = [NoneCollision('a', level) for level in range(7)]
+         indices = [map_mask(none_hash, shift) for shift in range(0, 32, 5)]