From c80c609950fe5aeecf3082d397c7b5149a834fca Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Sun, 5 Jul 2015 09:38:47 -0600 Subject: STY: PEP8 fixes for numpy/testing numpy/testing/tests. --- numpy/testing/tests/test_decorators.py | 2 -- numpy/testing/tests/test_utils.py | 29 ++++++++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) (limited to 'numpy/testing/tests') diff --git a/numpy/testing/tests/test_decorators.py b/numpy/testing/tests/test_decorators.py index 36c7cc7bb..1c7f6c047 100644 --- a/numpy/testing/tests/test_decorators.py +++ b/numpy/testing/tests/test_decorators.py @@ -99,7 +99,6 @@ def test_skip_generators_hardcoded(): else: raise Exception('Failed to mark as known failure') - @dec.knownfailureif(False, "This test is NOT known to fail") def g2(x): for i in range(x): @@ -133,7 +132,6 @@ def test_skip_generators_callable(): else: raise Exception('Failed to mark as known failure') - @dec.knownfailureif(skip_tester, "This test is NOT known to fail") def g2(x): for i in range(x): diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py index 68075fc3d..e75914833 100644 --- a/numpy/testing/tests/test_utils.py +++ b/numpy/testing/tests/test_utils.py @@ -236,18 +236,18 @@ class TestArrayAlmostEqual(_GenericTest, unittest.TestCase): ainf = np.array([np.inf]) self._assert_func(anan, anan) self.assertRaises(AssertionError, - lambda : self._assert_func(anan, aone)) + lambda: self._assert_func(anan, aone)) self.assertRaises(AssertionError, - lambda : self._assert_func(anan, ainf)) + lambda: self._assert_func(anan, ainf)) self.assertRaises(AssertionError, - lambda : self._assert_func(ainf, anan)) + lambda: self._assert_func(ainf, anan)) def test_inf(self): a = np.array([[1., 2.], [3., 4.]]) b = a.copy() a[0, 0] = np.inf self.assertRaises(AssertionError, - lambda : self._assert_func(a, b)) + lambda: self._assert_func(a, b)) def test_subclass(self): a = np.array([[1., 2.], [3., 4.]]) @@ -265,17 +265,17 @@ class TestAlmostEqual(_GenericTest, unittest.TestCase): def test_nan_item(self): self._assert_func(np.nan, np.nan) self.assertRaises(AssertionError, - lambda : self._assert_func(np.nan, 1)) + lambda: self._assert_func(np.nan, 1)) self.assertRaises(AssertionError, - lambda : self._assert_func(np.nan, np.inf)) + lambda: self._assert_func(np.nan, np.inf)) self.assertRaises(AssertionError, - lambda : self._assert_func(np.inf, np.nan)) + lambda: self._assert_func(np.inf, np.nan)) def test_inf_item(self): self._assert_func(np.inf, np.inf) self._assert_func(-np.inf, -np.inf) self.assertRaises(AssertionError, - lambda : self._assert_func(np.inf, 1)) + lambda: self._assert_func(np.inf, 1)) def test_simple_item(self): self._test_not_equal(1, 2) @@ -350,11 +350,11 @@ class TestApproxEqual(unittest.TestCase): ainf = np.array(np.inf) self._assert_func(anan, anan) self.assertRaises(AssertionError, - lambda : self._assert_func(anan, aone)) + lambda: self._assert_func(anan, aone)) self.assertRaises(AssertionError, - lambda : self._assert_func(anan, ainf)) + lambda: self._assert_func(anan, ainf)) self.assertRaises(AssertionError, - lambda : self._assert_func(ainf, anan)) + lambda: self._assert_func(ainf, anan)) def test_nan_items(self): anan = np.array(np.nan) @@ -362,11 +362,11 @@ class TestApproxEqual(unittest.TestCase): ainf = np.array(np.inf) self._assert_func(anan, anan) self.assertRaises(AssertionError, - lambda : self._assert_func(anan, aone)) + lambda: self._assert_func(anan, aone)) self.assertRaises(AssertionError, - lambda : self._assert_func(anan, ainf)) + lambda: self._assert_func(anan, ainf)) self.assertRaises(AssertionError, - lambda : self._assert_func(ainf, anan)) + lambda: self._assert_func(ainf, anan)) class TestRaises(unittest.TestCase): def setUp(self): @@ -539,7 +539,6 @@ class TestArrayAlmostEqualNulp(unittest.TestCase): self.assertRaises(AssertionError, assert_array_almost_equal_nulp, x, y, nulp) - def test_complex128_pass(self): nulp = 5 x = np.linspace(-20, 20, 50, dtype=np.float64) -- cgit v1.2.1