Stopping Bob and Ursula at appropriate times.

tests/fixtures.py

@@ -386,6 +386,9 @@ def federated_ursulas(ursula_federated_test_config):
     for port in _ports_to_remove:
         del MOCK_KNOWN_URSULAS_CACHE[port]
 
+    for u in _ursulas:
+        u.stop()
+
 
 @pytest.fixture(scope="function")
 def lonely_ursula_maker(ursula_federated_test_config):
@@ -403,6 +406,7 @@ def lonely_ursula_maker(ursula_federated_test_config):
 
         def clean(self):
             for ursula in self._made:
+                ursula.stop()
                 del MOCK_KNOWN_URSULAS_CACHE[ursula.rest_interface.port]
     _maker = _PartialUrsulaMaker()
     yield _maker

tests/integration/characters/test_bob_handles_frags.py

@@ -119,11 +119,11 @@ def test_bob_can_follow_treasure_map_even_if_he_only_knows_of_one_node(enacted_f
     bob.start_learning_loop()
 
     # ...and block until the unknown_nodes have all been found.
-    d = threads.deferToThread(bob.block_until_specific_nodes_are_known, unknown_nodes)
-    yield d
+    bob.block_until_specific_nodes_are_known(unknown_nodes)
 
     # ...and he now has no more unknown_nodes.
     assert len(bob.known_nodes) == len(treasure_map)
+    bob.disenchant()
 
 
 def test_bob_can_issue_a_work_order_to_a_specific_ursula(enacted_federated_policy, federated_bob,

tests/integration/characters/test_bob_joins_policy_and_retrieves.py

@@ -175,6 +175,8 @@ def test_bob_joins_policy_and_retrieves(federated_alice,
                                    label=policy.label,
                                    )
 
+    bob.disenchant()
+
 
 def test_treasure_map_serialization(enacted_federated_policy, federated_bob):
     treasure_map = enacted_federated_policy.treasure_map

tests/integration/characters/test_character_serialization.py

@@ -23,3 +23,4 @@ def test_serialize_ursula(federated_ursulas):
     ursula_as_bytes = bytes(ursula)
     ursula_object = Ursula.from_bytes(ursula_as_bytes)
     assert ursula == ursula_object
+    ursula.stop()