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
9 changes: 5 additions & 4 deletions tests/clients/test_healthcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,13 @@ def test_wait_for_sidecar_success_with_api_token(self, mock_urlopen):
def test_wait_for_sidecar_timeout(self, mock_urlopen):
mock_urlopen.return_value.__enter__.return_value = MagicMock(status=500)

start = time.time()
start = time.monotonic()

with self.assertRaises(TimeoutError):
DaprHealth.wait_for_sidecar()

self.assertGreaterEqual(time.time() - start, 2.5)
# Same clock as DaprHealth. On Windows, time.time() can read a few ms less.
self.assertGreaterEqual(time.monotonic() - start, 2.5)
self.assertGreater(mock_urlopen.call_count, 1)


Expand All @@ -103,14 +104,14 @@ def wait():
# Run in a daemon thread so a regression fails this test instead of hanging
# the whole session.
waiter = threading.Thread(target=wait, daemon=True)
start = time.time()
start = time.monotonic()
waiter.start()
waiter.join(self.HANG_LIMIT_SECONDS)

self.assertFalse(waiter.is_alive(), 'wait_for_sidecar() blocked past DAPR_HEALTH_TIMEOUT')
self.assertIsInstance(outcome.get('error'), TimeoutError)
self.assertIn('Dapr health check timed out', str(outcome['error']))
self.assertLess(time.time() - start, self.HANG_LIMIT_SECONDS)
self.assertLess(time.monotonic() - start, self.HANG_LIMIT_SECONDS)
logged = [str(call.args[0]) for call in mock_print.call_args_list if call.args]
self.assertTrue(any(line.endswith('failed: timed out') for line in logged), logged)
self.assertFalse(any(line.startswith('Unexpected error') for line in logged), logged)
9 changes: 5 additions & 4 deletions tests/clients/test_healthcheck_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,13 @@ async def test_wait_for_sidecar_timeout(self, mock_get):
mock_response.__aexit__ = AsyncMock(return_value=None)
mock_get.return_value = mock_response

start = time.time()
start = time.monotonic()

with self.assertRaises(TimeoutError):
await DaprHealth.wait_for_sidecar()

self.assertGreaterEqual(time.time() - start, 2.5)
# Same clock as DaprHealth. On Windows, time.time() can read a few ms less.
self.assertGreaterEqual(time.monotonic() - start, 2.5)
self.assertGreater(mock_get.call_count, 1)

@patch.object(settings, 'DAPR_HTTP_ENDPOINT', 'http://domain.com:3500')
Expand Down Expand Up @@ -174,13 +175,13 @@ async def test_multiple_health_checks_concurrent(self, mock_get):
mock_get.return_value = mock_response

# Run multiple health checks concurrently
start_time = time.time()
start_time = time.monotonic()
results = await asyncio.gather(
DaprHealth.wait_for_sidecar(),
DaprHealth.wait_for_sidecar(),
DaprHealth.wait_for_sidecar(),
)
elapsed = time.time() - start_time
elapsed = time.monotonic() - start_time

# All should complete successfully
self.assertEqual(len(results), 3)
Expand Down
Loading