From 8cf6939a00513a239db59489ae6cfac52f500ede Mon Sep 17 00:00:00 2001
From: Nicolas Cuervo <cuervonicolas@gmail.com>
Date: Mon, 11 Nov 2019 19:27:59 +0100
Subject: runtime: fix gr_unittest floatAlmostEqual
The call inside this assert was using a generator inside the standard all(),
which was always returning `False`, and silently passing the test, instead of
actually asserting in fail. Changing to list comprehension for assertion raising
---
gnuradio-runtime/python/gnuradio/gr_unittest.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'gnuradio-runtime/python/gnuradio/gr_unittest.py')
diff --git a/gnuradio-runtime/python/gnuradio/gr_unittest.py b/gnuradio-runtime/python/gnuradio/gr_unittest.py
index 57ce9a3761..f91d223052 100644
--- a/gnuradio-runtime/python/gnuradio/gr_unittest.py
+++ b/gnuradio-runtime/python/gnuradio/gr_unittest.py
@@ -82,10 +82,10 @@ class TestCase(unittest.TestCase):
places.0
"""
self.assertEqual(len(a), len(b))
- return all((
+ return all([
self.assertComplexAlmostEqual(x, y, places, msg)
for (x, y) in zip(a, b)
- ))
+ ])
def assertComplexTuplesAlmostEqual2(self, a, b,
@@ -95,10 +95,10 @@ class TestCase(unittest.TestCase):
Approximate equality is determined by calling assertComplexAlmostEqual().
"""
self.assertEqual(len(a), len(b))
- return all((
+ return all([
self.assertComplexAlmostEqual2(x, y, abs_eps, rel_eps, msg)
for (x, y) in zip(a, b)
- ))
+ ])
def assertFloatTuplesAlmostEqual(self, a, b, places=7, msg=None):
@@ -108,19 +108,19 @@ class TestCase(unittest.TestCase):
places.
"""
self.assertEqual(len(a), len(b))
- return all((
+ return all([
self.assertAlmostEqual(x, y, places, msg)
for (x, y) in zip(a, b)
- ))
+ ])
def assertFloatTuplesAlmostEqual2(self, a, b,
abs_eps=1e-12, rel_eps=1e-6, msg=None):
self.assertEqual(len(a), len(b))
- return all((
+ return all([
self.assertComplexAlmostEqual2(x, y, abs_eps, rel_eps, msg)
for (x, y) in zip(a, b)
- ))
+ ])
TestResult = unittest.TestResult
TestSuite = unittest.TestSuite
--
cgit v1.2.3