Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/advertizerIntegrationTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_sends_hello_when_advertises_service(self):
# When
advertizer.advertise(SERVICE_INFO)

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(1, len(messages)))

# Then
self.assertEqual([SERVICE_INFO.to_dict()], messages)
Expand All @@ -61,7 +61,7 @@ def test_sends_hello_when_query_received(self):
# When
test_sender.send(ServiceQuery('test-service', 'test-role'))

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(1, len(messages)))

# Then
self.assertEqual([SERVICE_INFO.to_dict()], messages)
Expand All @@ -86,7 +86,7 @@ def test_sends_hello_when_info_changed_and_query_received(self):
query = ServiceQuery('test-service', 'test-role')
test_sender.send(query)

wait_for_assertion(0.1, lambda: self.assertEqual(2, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(2, len(messages)))

new_service_info = ServiceInfo(
SERVICE_INFO.uuid, SERVICE_INFO.name, SERVICE_INFO.role, {'test': 'http://localhost:9090'}
Expand All @@ -96,7 +96,7 @@ def test_sends_hello_when_info_changed_and_query_received(self):
# When
test_sender.send(query)

wait_for_assertion(0.1, lambda: self.assertEqual(4, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(4, len(messages)))

# Then
self.assertEqual([
Expand All @@ -119,7 +119,7 @@ def test_sends_hello_when_schedules_advertisement_once(self):
# When
scheduled_advertizer.schedule(SERVICE_INFO, interval=0.01, one_shot=True)

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(1, len(messages)))

# Then
self.assertEqual([SERVICE_INFO.to_dict()], messages)
Expand All @@ -141,7 +141,7 @@ def test_sends_hello_when_schedules_advertisement_periodically(self):
scheduled_advertizer.schedule(SERVICE_INFO, interval=0.01)

# Then
wait_for_assertion(0.1, lambda: self.assertEqual(5, len(messages)))
wait_for_assertion(1, lambda: self.assertTrue(len(messages) >= 10))


if __name__ == '__main__':
Expand Down
16 changes: 8 additions & 8 deletions tests/apiIntegrationTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def test_discoverer_caches_advertised_service(self):
# When
advertizer.advertise()

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(1, len(discoverer.get_services())))

# Then
self.assertEqual({SERVICE_INFO.uuid: SERVICE_INFO}, discoverer.get_services())
Expand All @@ -57,7 +57,7 @@ def test_discoverer_caches_advertised_services(self):
Thread(target=advertizer1.advertise).start()
Thread(target=advertizer2.advertise).start()

wait_for_assertion(0.2, lambda: self.assertEqual(2, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(2, len(discoverer.get_services())))

# Then
self.assertEqual({
Expand All @@ -77,7 +77,7 @@ def test_discoverer_caches_advertised_service_when_advertisement_scheduled_once(
# When
advertizer.schedule(interval=0.01, one_shot=True)

wait_for_assertion(0.2, lambda: self.assertEqual(1, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(1, len(discoverer.get_services())))

# Then
self.assertEqual({SERVICE_INFO.uuid: SERVICE_INFO}, discoverer.get_services())
Expand All @@ -94,7 +94,7 @@ def test_discoverer_caches_advertised_service_when_advertisement_scheduled_perio
# When
advertizer.schedule(interval=0.01)

wait_for_assertion(0.2, lambda: self.assertEqual(1, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(1, len(discoverer.get_services())))

# Then
self.assertEqual({SERVICE_INFO.uuid: SERVICE_INFO}, discoverer.get_services())
Expand All @@ -111,7 +111,7 @@ def test_discoverer_caches_discovery_response_service(self):
# When
discoverer.discover()

wait_for_assertion(0.2, lambda: self.assertEqual(1, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(1, len(discoverer.get_services())))

# Then
self.assertEqual({SERVICE_INFO.uuid: SERVICE_INFO}, discoverer.get_services())
Expand All @@ -132,7 +132,7 @@ def test_discoverer_caches_discovery_response_services(self):
# When
discoverer.discover()

wait_for_assertion(0.2, lambda: self.assertEqual(2, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(2, len(discoverer.get_services())))

# Then
self.assertEqual({
Expand All @@ -152,7 +152,7 @@ def test_discoverer_caches_discovery_response_service_when_discovery_scheduled_o
# When
discoverer.schedule(interval=0.01, one_shot=True)

wait_for_assertion(0.2, lambda: self.assertEqual(1, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(1, len(discoverer.get_services())))

# Then
self.assertEqual({SERVICE_INFO.uuid: SERVICE_INFO}, discoverer.get_services())
Expand All @@ -169,7 +169,7 @@ def test_discoverer_caches_discovery_response_service_when_discovery_scheduled_p
# When
discoverer.schedule(interval=0.01)

wait_for_assertion(0.2, lambda: self.assertEqual(1, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(1, len(discoverer.get_services())))

# Then
self.assertEqual({SERVICE_INFO.uuid: SERVICE_INFO}, discoverer.get_services())
Expand Down
12 changes: 6 additions & 6 deletions tests/discovererIntegrationTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def test_discovers_service_when_hello_received(self):
# When
test_sender.send(SERVICE_INFO)

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(1, len(discoverer.get_services())))

# Then
self.assertEqual({SERVICE_INFO.uuid: SERVICE_INFO}, discoverer.get_services())
Expand All @@ -53,15 +53,15 @@ def test_updates_service_when_info_changed(self):

test_sender.send(SERVICE_INFO)

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(discoverer.get_services())))
wait_for_assertion(1, lambda: self.assertEqual(1, len(discoverer.get_services())))

# When
new_service_info = ServiceInfo(
SERVICE_INFO.uuid, SERVICE_INFO.name, SERVICE_INFO.role, {'test': 'http://localhost:9090'}
)
test_sender.send(new_service_info)

wait_for_assertion(0.1, lambda: self.assertEqual(
wait_for_assertion(1, lambda: self.assertEqual(
'http://localhost:9090',
discoverer.get_services()[SERVICE_INFO.uuid].urls['test']
))
Expand All @@ -87,7 +87,7 @@ def test_sends_query(self):
# When
discoverer.discover(SERVICE_QUERY)

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(1, len(messages)))

# Then
self.assertEqual([SERVICE_QUERY.__dict__], messages)
Expand All @@ -109,7 +109,7 @@ def test_sends_query_when_schedules_discovery_once(self):
# When
scheduled_discoverer.schedule(SERVICE_QUERY, interval=0.01, one_shot=True)

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(1, len(messages)))

# Then
self.assertEqual([SERVICE_QUERY.__dict__], messages)
Expand All @@ -132,7 +132,7 @@ def test_sends_query_when_schedules_discovery_periodically(self):
scheduled_discoverer.schedule(SERVICE_QUERY, interval=0.01)

# Then
wait_for_assertion(0.1, lambda: self.assertEqual(5, len(messages)))
wait_for_assertion(1, lambda: self.assertTrue(len(messages) >= 10))


if __name__ == '__main__':
Expand Down
4 changes: 2 additions & 2 deletions tests/dishReceiverTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def test_calls_registered_handler_on_message(self):
receiver.start(group)

# Then
wait_for_assertion(0.1, lambda: handler.assert_called_once_with(SERVICE_INFO.to_dict()))
wait_for_assertion(1, lambda: handler.assert_called_once_with(SERVICE_INFO.to_dict()))

def test_handles_message_receive_error_gracefully(self):
# Given
Expand Down Expand Up @@ -168,7 +168,7 @@ def test_handles_handler_execution_error_gracefully(self):
receiver.start(group)

# Then
wait_for_assertion(0.1, lambda: handler.assert_called_once_with(SERVICE_INFO.to_dict()))
wait_for_assertion(1, lambda: handler.assert_called_once_with(SERVICE_INFO.to_dict()))


if __name__ == '__main__':
Expand Down
2 changes: 1 addition & 1 deletion tests/receiverIntegrationTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def test_receives_message(self):
# When
radio.send_json(SERVICE_INFO.to_dict(), group=group.name)

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(1, len(messages)))

# Then
self.assertEqual([SERVICE_INFO.to_dict()], messages)
Expand Down
2 changes: 1 addition & 1 deletion tests/senderIntegrationTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def test_sends_message(self):
# When
sender.send(SERVICE_INFO)

wait_for_assertion(0.1, lambda: self.assertEqual(1, len(messages)))
wait_for_assertion(1, lambda: self.assertEqual(1, len(messages)))

# Then
self.assertEqual([SERVICE_INFO.to_dict()], messages)
Expand Down
Loading