diff options
author | Maciej Żenczykowski <maze@google.com> | 2024-04-05 12:21:24 -0700 |
---|---|---|
committer | Maciej Żenczykowski <maze@google.com> | 2024-04-05 12:21:33 -0700 |
commit | d3bd25735b71ad8391bb537dd56c9dc9aff11588 (patch) | |
tree | fd1ba20ce8fbaf868c17cbe4321767304ffdba17 | |
parent | ef5ee4da9794ac35220c901ced6f96027dc34f64 (diff) | |
download | tests-d3bd25735b71ad8391bb537dd56c9dc9aff11588.tar.gz |
net-test: fix propagation of server_error exception
Test: TreeHugger, manually
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I51ea188b68747c69d985f16a9a3ead161608b13d
-rwxr-xr-x | net/test/xfrm_algorithm_test.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/test/xfrm_algorithm_test.py b/net/test/xfrm_algorithm_test.py index 2b3b34a..724fec0 100755 --- a/net/test/xfrm_algorithm_test.py +++ b/net/test/xfrm_algorithm_test.py @@ -330,7 +330,7 @@ class XfrmAlgorithmTest(xfrm_base.XfrmLazyTest): spi_left, req_ids[3], None) server_ready = threading.Event() - server_error = None # Save exceptions thrown by the server. + self.server_error = None # Save exceptions thrown by the server. def TcpServer(sock, client_port): try: @@ -345,7 +345,7 @@ class XfrmAlgorithmTest(xfrm_base.XfrmLazyTest): accepted.shutdown(socket.SHUT_RDWR) accepted.close() except Exception as e: - server_error = e + self.server_error = e finally: sock.close() @@ -358,7 +358,7 @@ class XfrmAlgorithmTest(xfrm_base.XfrmLazyTest): self.assertEqual(b"hello request", data) sock.sendto(b"hello response", peer) except Exception as e: - server_error = e + self.server_error = e finally: sock.close() @@ -389,8 +389,8 @@ class XfrmAlgorithmTest(xfrm_base.XfrmLazyTest): sock_left.close() server.join(timeout=2.0) self.assertFalse(server.is_alive(), "Timed out waiting for server exit") - if server_error: - raise server_error + if self.server_error: + raise self.server_error if __name__ == "__main__": |