more tests for untested code, delete some unused code

radix · radix · commit c63d84f25ed8 · 2014-06-08T21:46:44.000-05:00
diff --git a/effect/__init__.py b/effect/__init__.py
@@ -201,15 +201,6 @@ def guard(f, *args, **kwargs):
         return (True, sys.exc_info())
 
 
-def _iter_conses(seq):
-    """
-    Generate (head, tail) tuples so you can iterate in a way that feels like
-    a typical recursive function over a linked list.
-    """
-    for i in range(len(seq)):
-        yield seq[i], seq[i + 1:]
-
-
 class NoEffectHandlerError(Exception):
     """
     No Effect handler could be found for the given Effect-wrapped object.
diff --git a/effect/test_effect.py b/effect/test_effect.py
@@ -5,7 +5,7 @@
                                 raises, MatchesPredicateWithParams)
 
 from . import (Effect, NoEffectHandlerError, synchronous_performer, perform,
-               default_dispatcher, sync_perform)
+               default_dispatcher, sync_perform, NotSynchronousError)
 from .testing import StubIntent
 
 
@@ -106,6 +106,12 @@ def test_effects_returning_effects_returning_effects(self):
                                     StubIntent("foo"))))))),
             "foo")
 
+    def test_sync_perform_async_effect(self):
+        """If an effect is asynchronous, sync_effect raises an error."""
+        self.assertRaises(NotSynchronousError,
+                          lambda: sync_perform(Effect(StubIntent("foo")),
+                                               dispatcher=lambda i, box: None))
+
 
 class CallbackTests(TestCase):
     """Tests for callbacks."""
diff --git a/effect/test_testing.py b/effect/test_testing.py
@@ -122,6 +122,15 @@ def test_fail_effect(self):
                     ValueError('oh deary me')),
             raises(ValueError('oh deary me')))
 
+    def test_skip_callbacks(self):
+        """
+        Intermediate callbacks of the wrong type are skipped.
+        """
+        eff = (Effect('foo')
+               .on_error(lambda f: 1)
+               .on_success(lambda x: ('succeeded', x)))
+        self.assertEqual(resolve_effect(eff, 'foo'), ('succeeded', 'foo'))
+
 
 def _raise(e):
     raise e
