Merge pull request #209 from onefinestay/better_keyboardinterrupt_test

safer test for keyboardinterrupt
nameko · Feb 17, 2015 · 5c5b86e · 5c5b86e
2 parents 1f1b077 + 1229b19
commit 5c5b86e
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/test/standalone/test_rpc_proxy.py b/test/standalone/test_rpc_proxy.py
@@ -366,15 +366,10 @@ def test_recover_from_keyboardinterrupt(
         def call():
             return proxy.spam(ham=0)
 
-        gt = eventlet.spawn(call)
-        eventlet.sleep(.1)  # make sure `call` is scheduled
-
-        gt.kill(KeyboardInterrupt('killing from test'))
-        # wait for it to die
-        try:
-            gt.wait()
-        except KeyboardInterrupt:
-            pass
+        with patch('nameko.standalone.rpc.queue_iterator') as iterator:
+            iterator.side_effect = KeyboardInterrupt('killing from test')
+            with pytest.raises(KeyboardInterrupt):
+                proxy.spam(ham=0)
 
         container = container_factory(FooService, rabbit_config)
         container.start()