Make TimeoutError catching more robust

Author: jacobschaer

tests/test_client.py

@@ -631,7 +631,7 @@ def test_send_diagnostic_times_out_when_only_invalid_source_ack_nack(mock_socket
     sut = DoIPClient(test_ip, test_logical_address)
     mock_socket.rx_queue.append(diagnostic_ack_invalid_source)
     mock_socket.rx_queue.append(diagnostic_nack_invalid_source)
-    with pytest.raises(TimeoutError, match=r"ECU failed to respond in time"):
+    with pytest.raises(TimeoutError):
         sut.send_diagnostic(bytearray([0, 1, 2]), timeout=0.01)
     assert mock_socket.tx_queue[-1] == diagnostic_request
 
@@ -640,7 +640,7 @@ def test_send_diagnostic_times_out_when_only_invalid_target_ack_nack(mock_socket
     sut = DoIPClient(test_ip, test_logical_address)
     mock_socket.rx_queue.append(diagnostic_ack_invalid_target)
     mock_socket.rx_queue.append(diagnostic_nack_invalid_target)
-    with pytest.raises(TimeoutError, match=r"ECU failed to respond in time"):
+    with pytest.raises(TimeoutError):
         sut.send_diagnostic(bytearray([0, 1, 2]), timeout=0.01)
     assert mock_socket.tx_queue[-1] == diagnostic_request
 
@@ -710,7 +710,7 @@ def test_send_diagnostic_to_address_times_out_when_only_invalid_source_ack_nack(
     sut = DoIPClient(test_ip, test_logical_address)
     mock_socket.rx_queue.append(diagnostic_ack_to_address_invalid_source)
     mock_socket.rx_queue.append(diagnostic_nack_to_address_invalid_source)
-    with pytest.raises(TimeoutError, match=r"ECU failed to respond in time"):
+    with pytest.raises(TimeoutError):
         sut.send_diagnostic_to_address(0x1234, bytearray([0, 1, 2]), timeout=0.01)
     assert mock_socket.tx_queue[-1] == diagnostic_request_to_address
 
@@ -721,7 +721,7 @@ def test_send_diagnostic_to_address_times_out_when_only_invalid_target_ack_nack(
     sut = DoIPClient(test_ip, test_logical_address)
     mock_socket.rx_queue.append(diagnostic_ack_to_address_invalid_target)
     mock_socket.rx_queue.append(diagnostic_nack_to_address_invalid_target)
-    with pytest.raises(TimeoutError, match=r"ECU failed to respond in time"):
+    with pytest.raises(TimeoutError):
         sut.send_diagnostic_to_address(0x1234, bytearray([0, 1, 2]), timeout=0.01)
     assert mock_socket.tx_queue[-1] == diagnostic_request_to_address
 
@@ -735,7 +735,7 @@ def test_receive_diagnostic(mock_socket):
 
 def test_receive_diagnostic_timeout(mock_socket):
     sut = DoIPClient(test_ip, test_logical_address)
-    with pytest.raises(TimeoutError, match=r"ECU failed to respond in time"):
+    with pytest.raises(TimeoutError):
         sut.receive_diagnostic(timeout=0.01)