Merge pull request #90 from khauersp/feature/fill-in-missing-timeout

fill in missing timeouts

j1939/Dm14Query.py

@@ -239,9 +239,15 @@ def read(
         self._send_dm14(7)
         self.state = QueryState.WAIT_FOR_SEED
         # wait for operation completed DM15 message
-        raw_bytes = self.data_queue.get(block=True, timeout=1)
+        raw_bytes = None
+        try:
+            raw_bytes = self.data_queue.get(block=True, timeout=max_timeout)
+        except queue.Empty:
+            if self.state is QueryState.WAIT_FOR_SEED:
+                raise RuntimeError("No response from server")
+            pass
         for _ in range(self.exception_queue.qsize()):
-            raise self.exception_queue.get(block=False, timeout=1)
+            raise self.exception_queue.get(block=False, timeout=max_timeout)
         if raw_bytes:
             if self.return_raw_bytes:
                 return raw_bytes
@@ -282,7 +288,7 @@ def write(
         try:
             self.data_queue.get(block=True, timeout=max_timeout)
             for _ in range(self.exception_queue.qsize()):
-                raise self.exception_queue.get(block=False, timeout=1)
+                raise self.exception_queue.get(block=False, timeout=max_timeout)
         except queue.Empty:
             if self.state is QueryState.WAIT_FOR_SEED:
                 raise RuntimeError("No response from server")

test/test_memory_access.py

@@ -575,7 +575,7 @@ def test_dm14_read_timeout_error(feeder):
     Tests that the DM14 read query can react to timeout errors correctly
     :param feeder: can message feeder
     """
-    with pytest.raises(queue.Empty) as excinfo:
+    with pytest.raises(RuntimeError) as excinfo:
         feeder.can_messages = [
             (
                 Feeder.MsgType.CANTX,