From d5f7289515b639937e615945f4551d7ac7f7bb10 Mon Sep 17 00:00:00 2001 From: "Kieran R. Prasch" Date: Wed, 15 May 2019 16:54:12 -0600 Subject: [PATCH] Do not assume the existence of a global domain in test --- nucypher/network/nodes.py | 4 ++-- tests/learning/test_domains.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nucypher/network/nodes.py b/nucypher/network/nodes.py index 2f6bc4fd0..7f781f1f0 100644 --- a/nucypher/network/nodes.py +++ b/nucypher/network/nodes.py @@ -703,8 +703,8 @@ class Learner: unresponsive_nodes = set() try: # TODO: Streamline path generation - certificate_filepath = self.node_storage.generate_certificate_filepath( - checksum_address=current_teacher.checksum_public_address) + certificate_filepath = self.node_storage.generate_certificate_filepath(checksum_address=current_teacher.checksum_public_address) + response = self.network_middleware.get_nodes_via_rest(node=current_teacher, nodes_i_need=self._node_ids_to_learn_about_immediately, announce_nodes=announce_nodes, diff --git a/tests/learning/test_domains.py b/tests/learning/test_domains.py index 5420d7c2b..fcf964a05 100644 --- a/tests/learning/test_domains.py +++ b/tests/learning/test_domains.py @@ -8,9 +8,10 @@ def test_learner_learns_about_domains_separately(ursula_federated_test_config, c ursula_config=ursula_federated_test_config, quantity=3, know_each_other=True) - global_learners = lonely_ursula_maker() - first_domain_learners = lonely_ursula_maker(domains=set([b"nucypher1.test_suite"])) - second_domain_learners = lonely_ursula_maker(domains=set([b"nucypher2.test_suite"])) + + global_learners = lonely_ursula_maker(domains={b"nucypher1.test_suite"}) + first_domain_learners = lonely_ursula_maker(domains={b"nucypher1.test_suite"}) + second_domain_learners = lonely_ursula_maker(domains={b"nucypher2.test_suite"}) big_learner = global_learners.pop() @@ -24,10 +25,11 @@ def test_learner_learns_about_domains_separately(ursula_federated_test_config, c big_learner._current_teacher_node = second_domain_learners.pop() big_learner.learn_from_teacher_node() - assert len(big_learner.known_nodes) == 8 + # All domain 1 nodes + assert len(big_learner.known_nodes) == 5 - new_first_domain_learner = lonely_ursula_maker(domains=set([b"nucypher1.test_suite"])).pop() - new_second_domain_learner = lonely_ursula_maker(domains=set([b"nucypher2.test_suite"])) + new_first_domain_learner = lonely_ursula_maker(domains={b"nucypher1.test_suite"}).pop() + new_second_domain_learner = lonely_ursula_maker(domains={b"nucypher2.test_suite"}) new_first_domain_learner._current_teacher_node = big_learner new_first_domain_learner.learn_from_teacher_node()