diff --git a/src/aare/queue/models.py b/src/aare/queue/models.py index b211e183..de13161f 100644 --- a/src/aare/queue/models.py +++ b/src/aare/queue/models.py @@ -87,8 +87,7 @@ def parse_queue_item(raw: str | bytes) -> AareQueueItem: ValueError: the entry is not valid JSON, carries no usable id/kind, or is a malformed instance of a kind we do recognise -- all corrupt rather than merely unrecognised. - TypeError: the entry is valid JSON but not an object, so there is no - payload a forward-compatible reader could preserve. + TypeError: the entry is valid JSON but not an object """ try: return _KNOWN_ADAPTER.validate_json(raw) diff --git a/tests/unit/queue/test_queue_client.py b/tests/unit/queue/test_queue_client.py index 93108863..f0e81963 100644 --- a/tests/unit/queue/test_queue_client.py +++ b/tests/unit/queue/test_queue_client.py @@ -21,9 +21,6 @@ BEAMLINE = MXBeamline.X10SA QUEUE_KEY = str(BEAMLINE) + QUEUE_KEY_SUFFIX NOTIFY_CHANNEL = str(BEAMLINE) + QUEUE_NOTIFICATION_CHANNEL_SUFFIX -# Callbacks run on the client's dispatch thread, so tests wait on an Event -# rather than sleeping. Generous enough for a loaded CI box, but only ever -# paid in full when something is actually broken. DISPATCH_TIMEOUT_S = 2.0 # Waiting for something NOT to happen has to be a real sleep; keep it short. QUIET_PERIOD_S = 0.3