Skip to content

Commit 61c28da

Browse files
committed
Update time assertions to satisfy windows.. Fix lint issues
1 parent eb59db3 commit 61c28da

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_exporter_mixin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def test_shutdown_interrupts_export_retry_backoff(self):
327327
begin_wait = time.time()
328328
export_thread.start()
329329
# Wait a bit for export to fail and the backoff sleep to start
330-
time.sleep(0.05)
330+
time.sleep(0.1)
331331
# The code should now be in a 1 second backoff.
332332
# pylint: disable=protected-access
333333
self.assertFalse(self.exporter._shutdown_is_occuring.is_set())
@@ -337,7 +337,7 @@ def test_shutdown_interrupts_export_retry_backoff(self):
337337
end_wait = time.time()
338338
self.assertEqual(export_result, SpanExportResult.FAILURE)
339339
# Shutdown should have interrupted the sleep.
340-
self.assertTrue(end_wait - begin_wait < 0.2)
340+
self.assertTrue(end_wait - begin_wait < 0.3)
341341
self.assertEqual(
342342
warning.records[1].message,
343343
"Shutdown in progress, aborting retry.",

opentelemetry-sdk/tests/shared_internal/test_batch_processor.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,11 @@ def __init__(self, export_sleep: int):
6161
def export(self, _: list[Any]):
6262
self.num_export_calls += 1
6363
if self._shutdown:
64-
raise Exception("Cannot export, already shutdown")
64+
raise ValueError("Cannot export, already shutdown")
6565

6666
sleep_interrupted = self.export_sleep_event.wait(self.export_sleep)
6767
if sleep_interrupted:
68-
raise Exception("Did not get to finish !")
69-
return
68+
raise ValueError("Did not get to finish !")
7069

7170
def shutdown(self):
7271
# Force export to finish sleeping.
@@ -240,7 +239,7 @@ def test_shutdown_allows_1_export_to_finish(
240239
assert processor._batch_processor._worker_thread.is_alive() is True
241240

242241
after = time.time()
243-
assert after - before < 3.2
242+
assert after - before < 3.3
244243
# Thread will naturally finish after a little bit.
245244
time.sleep(0.1)
246245
assert processor._batch_processor._worker_thread.is_alive() is False

0 commit comments

Comments
 (0)