From d69447038f9f64967d05cb734a1b98de98d854e8 2013-09-03 17:08:34
From: Thomas Kluyver <takowl@gmail.com>
Date: 2013-09-03 17:08:34
Subject: [PATCH] Remove tests for parametric test machinery

---

diff --git a/IPython/testing/tests/test_decorators.py b/IPython/testing/tests/test_decorators.py
index cb87d2f..340c00a 100644
--- a/IPython/testing/tests/test_decorators.py
+++ b/IPython/testing/tests/test_decorators.py
@@ -12,7 +12,6 @@ import nose.tools as nt
 # Our own
 from IPython.testing import decorators as dec
 from IPython.testing.skipdoctest import skip_doctest
-from IPython.testing.ipunittest import ParametricTestCase
 
 #-----------------------------------------------------------------------------
 # Utilities
@@ -47,24 +46,6 @@ def trivial():
     """A trivial test"""
     pass
 
-# Some examples of parametric tests.
-
-def is_smaller(i,j):
-    assert i<j,"%s !< %s" % (i,j)
-
-class Tester(ParametricTestCase):
-
-    def test_parametric(self):
-        yield is_smaller(3, 4)
-        x, y = 1, 2
-        yield is_smaller(x, y)
-
-@dec.parametric
-def test_par_standalone():
-    yield is_smaller(3, 4)
-    x, y = 1, 2
-    yield is_smaller(x, y)
-
 
 @dec.skip
 def test_deliberately_broken():
diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py
index d821878..36a38d7 100644
--- a/IPython/testing/tests/test_tools.py
+++ b/IPython/testing/tests/test_tools.py
@@ -51,26 +51,24 @@ def test_full_path_win32():
     nt.assert_equal(result, ['c:\\a.txt'])
 
     
-@dec.parametric
 def test_parser():
     err = ("FAILED (errors=1)", 1, 0)
     fail = ("FAILED (failures=1)", 0, 1)
     both = ("FAILED (errors=1, failures=1)", 1, 1)
     for txt, nerr, nfail in [err, fail, both]:
         nerr1, nfail1 = tt.parse_test_output(txt)
-        yield nt.assert_equal(nerr, nerr1)
-        yield nt.assert_equal(nfail, nfail1)
+        nt.assert_equal(nerr, nerr1)
+        nt.assert_equal(nfail, nfail1)
+
 
-        
-@dec.parametric
 def test_temp_pyfile():
     src = 'pass\n'
     fname, fh = tt.temp_pyfile(src)
-    yield nt.assert_true(os.path.isfile(fname))
+    assert os.path.isfile(fname)
     fh.close()
     with open(fname) as fh2:
         src2 = fh2.read()
-    yield nt.assert_equal(src2, src)
+    nt.assert_equal(src2, src)
 
 class TestAssertPrints(unittest.TestCase):
     def test_passing(self):