[pandas] 01/02: Exclude one more test and de-activate non-working ignore of test errors

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch debian
in repository pandas.

commit 8ff10a570ba9f34b87e0899ab27629ecae516413
Author: Andreas Tille <tille at debian.org>
Date:   Mon Oct 23 17:33:41 2017 +0200

    Exclude one more test and de-activate non-working ignore of test errors
---
 debian/changelog                                   |  1 +
 .../mark_tests_working_on_intel_s390x.patch        | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  9 ++++----
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14140fb..c558ebb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pandas (0.20.3-7) UNRELEASED; urgency=medium
   * Use Debian packaged mathjax
   * Do not Recommends python3-six since it is mentioned in Depends
   * Remove redundant/outdated XS-Testsuite: autopkgtest
+  * Exclude one more test and de-activate non-working ignore of test errors
 
  -- Andreas Tille <tille at debian.org>  Mon, 23 Oct 2017 14:18:56 +0200
 
diff --git a/debian/patches/mark_tests_working_on_intel_s390x.patch b/debian/patches/mark_tests_working_on_intel_s390x.patch
new file mode 100644
index 0000000..db69820
--- /dev/null
+++ b/debian/patches/mark_tests_working_on_intel_s390x.patch
@@ -0,0 +1,24 @@
+Description: Mark those tests @pytest.mark.intel that pass only on Intel architectures
+  There was another test failing for s390x (and armhf, mips, hppa, powerpc, ppc64, sparc64)
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 23 Oct 2017 14:18:56 +0200
+Bug-Debian: https://bugs.debian.org/877419
+
+--- a/pandas/tests/io/test_packers.py
++++ b/pandas/tests/io/test_packers.py
+@@ -59,6 +59,7 @@ def all_packers_data():
+     return create_data()
+ 
+ 
++ at pytest.mark.intel
+ def check_arbitrary(a, b):
+ 
+     if isinstance(a, (list, tuple)) and isinstance(b, (list, tuple)):
+@@ -901,6 +902,7 @@ TestPackers
+         else:
+             tm.assert_frame_equal(result, expected)
+ 
++    @pytest.mark.intel
+     @pytest.mark.parametrize('version', legacy_packers_versions())
+     def test_msgpacks_legacy(self, current_packers_data, all_packers_data,
+                              version):
diff --git a/debian/patches/series b/debian/patches/series
index 2f76b04..8794228 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,5 @@ up_print_versions
 up_network_seaborn
 dateutil-2.6.1-fixed-ambiguous-tz-dst-be.patch
 mark_tests_working_on_intel.patch
+mark_tests_working_on_intel_s390x.patch
 mathjax-path.patch
diff --git a/debian/rules b/debian/rules
index 5482fd0..91fd725 100755
--- a/debian/rules
+++ b/debian/rules
@@ -156,7 +156,8 @@ override_dh_python3: _dh_python3
 override_dh_compress:
 	dh_compress -X.py -X.html -X.pdf -X.css -X.jpg -X.txt -X.js -X.json -X.rtc -Xobjects.inv
 
-ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),  armhf mips s390x hppa powerpc ppc64 sparc64))
-override_dh_auto_test:
-	dh_auto_test || true
-endif
+# This has no effect at all since the tests are run in binary-arch instead of auto_test ...
+#ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),  armhf mips s390x hppa powerpc ppc64 sparc64))
+#override_dh_auto_test:
+#	dh_auto_test || true
+#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pandas.git