-

cool-RR · cool-RR · commit 2b306f9fd0ac · 2014-10-02T16:58:15.000+03:00
diff --git a/source_py3/test_python_toolbox/test_logic_tools/test_all_equal.py b/source_py3/test_python_toolbox/test_logic_tools/test_all_equal.py
@@ -8,10 +8,10 @@
 from python_toolbox.logic_tools import all_equal
 
 
-def _iterate_exhaustive_tests():
+def test():
     '''Test the basic working of `all_equal`.'''
-    yield _check, False
-    yield _check, True
+    _check(False)
+    _check(True)
 
 
 def _check(exhaustive):
@@ -53,8 +53,4 @@ def __eq__(self, other):
     assert all_equal(funky_floats)
     assert not all_equal(funky_floats, exhaustive=True)
                 
-    
-# We use this shit because Nose can't parallelize generator tests:
-for i, x in enumerate(_iterate_exhaustive_tests()):
-    locals()['f_%s' % i] = lambda: x[0](*x[1:])
-    exec('def test_%s(): return f_%s()' % (i, i))
+    
diff --git a/source_py3/test_python_toolbox/test_persistent/test_cross_process_persistent.py b/source_py3/test_python_toolbox/test_persistent/test_cross_process_persistent.py
@@ -42,10 +42,9 @@ def test():
     checkers = [_check_deepcopying, _check_process_passing]
     cross_process_persistent_classes = [A, CrossProcessPersistent]
     
-    yield from itertools.product(
-        checkers,
-        cross_process_persistent_classes,
-    )
+    for checker, type_ in itertools.product(checkers,
+                                            cross_process_persistent_classes):
+        checker(type_)
     
         
 def _check_deepcopying(cross_process_persistent_class):
@@ -173,11 +172,12 @@ def test_helpful_warnings_for_old_protocols():
     )
     
     for pickle_module, cross_process_persistent, old_protocol in iterator:
-        yield (_check_helpful_warnings_for_old_protocols, 
-               pickle_module,
-               cross_process_persistent,
-               old_protocol)
-            
+        _check_helpful_warnings_for_old_protocols(
+            pickle_module,
+            cross_process_persistent,
+            old_protocol
+        )
+        
     
 def _check_helpful_warnings_for_old_protocols(pickle_module,
                                               cross_process_persistent,
