[pyresample] 02/04: Add patch to fix test_custom_uncert and test_gauss_uncert for mips*.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyresample.

commit d5d0fa95a3e2021ae820743242089931f455074a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 5 13:17:46 2016 +0200

    Add patch to fix test_custom_uncert and test_gauss_uncert for mips*.
    
    Thanks to Daniel Knezevic for the patch.
    (closes: #836733)
---
 debian/changelog                             |  9 ++++++
 debian/patches/0003-fix-tests-for-mips.patch | 43 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fcecc7a..ff1e171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pyresample (1.2.5-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add patch to fix test_custom_uncert and test_gauss_uncert for mips*.
+    Thanks to Daniel Knezevic for the patch.
+    (closes: #836733)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Sep 2016 13:16:28 +0200
+
 pyresample (1.2.5-1) unstable; urgency=medium
 
   * new upstream release
diff --git a/debian/patches/0003-fix-tests-for-mips.patch b/debian/patches/0003-fix-tests-for-mips.patch
new file mode 100644
index 0000000..15915b8
--- /dev/null
+++ b/debian/patches/0003-fix-tests-for-mips.patch
@@ -0,0 +1,43 @@
+Description: Fix test_custom_uncert and test_gauss_uncert for mips*.
+Author: Daniel Knezevic <Daniel.Knezevic at imgtec.com>
+Bug-Debian: https://bugs.debian.org/836733
+Bug: https://github.com/pytroll/pyresample/issues/43
+Forwarded: https://github.com/pytroll/pyresample/pull/46
+Appplied-Upstream: https://github.com/pytroll/pyresample/commit/0188c7feba2a020418c09cca2fbc65a4bc09931f
+
+--- a/pyresample/test/test_kd_tree.py
++++ b/pyresample/test/test_kd_tree.py
+@@ -75,13 +75,13 @@ class Test(unittest.TestCase):
+             res, stddev, count = kd_tree.resample_gauss(self.tswath, self.tdata,
+                                                         self.tgrid, 100000, sigma,
+                                                         with_uncert=True)
+-            self.assertFalse(
+-                len(w) != 1, 'Failed to create neighbour warning')
+-            self.assertFalse(('Searching' not in str(
+-                w[0].message)), 'Failed to create correct neighbour warning')
++            self.assertTrue(
++                len(w) > 0, 'Failed to create neighbour warning')
++            self.assertTrue((any('Searching' in str(_w.message) for _w in w)),
++                'Failed to create correct neighbour warning')
+ 
+         expected_res = 2.20206560694
+-        expected_stddev = 0.707115076173
++        exprcted_stddev = 0.707115076173
+         expected_count = 3
+         self.assertAlmostEqual(res[0], expected_res, 5,
+                                'Failed to calculate gaussian weighting with uncertainty')
+@@ -98,10 +98,10 @@ class Test(unittest.TestCase):
+             res, stddev, counts = kd_tree.resample_custom(self.tswath,
+                                                           self.tdata, self.tgrid,
+                                                           100000, wf, with_uncert=True)
+-            self.assertFalse(
+-                len(w) != 1, 'Failed to create neighbour warning')
+-            self.assertFalse(('Searching' not in str(
+-                w[0].message)), 'Failed to create correct neighbour warning')
++            self.assertTrue(
++                len(w) > 0, 'Failed to create neighbour warning')
++            self.assertTrue((any('Searching' in str(_w.message) for _w in w)),
++                'Failed to create correct neighbour warning')
+ 
+         self.assertAlmostEqual(res[0], 2.32193149, 5,
+                                'Failed to calculate custom weighting with uncertainty')
diff --git a/debian/patches/series b/debian/patches/series
index b939e25..4cd1fc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-fix-doc-build.patch
 0002-fix-proj4-initialization.patch
+0003-fix-tests-for-mips.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyresample.git