diff options
author | Maciej Żenczykowski <maze@google.com> | 2023-03-27 21:59:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-27 21:59:13 +0000 |
commit | 2103c359162e8d9418566b3ab9cd12a0bd594a5e (patch) | |
tree | f8995b5637505501788e91715e616ed6bec5a26b | |
parent | 487b2cce914e78dbb781228b5a44567eb582b7d6 (diff) | |
parent | 60cd04e19f35e363926e7bba3ceb626666de9eab (diff) | |
download | tests-2103c359162e8d9418566b3ab9cd12a0bd594a5e.tar.gz |
net-test: close() fixes for pf_key_test.py am: 5c9d3400b6 am: 60cd04e19f
Original change: https://android-review.googlesource.com/c/kernel/tests/+/2508299
Change-Id: Ibde9a6dd74a1f1ae0ed52f8d68cd772f954a4cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-x | net/test/pf_key.py | 7 | ||||
-rwxr-xr-x | net/test/pf_key_test.py | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/net/test/pf_key.py b/net/test/pf_key.py index cc8e76c..ca6689e 100755 --- a/net/test/pf_key.py +++ b/net/test/pf_key.py @@ -200,6 +200,13 @@ class PfKey(object): net_test.SetNonBlocking(self.sock) self.seq = 0 + def close(self): + self.sock.close() + self.sock = None + + def __del__(self): + if self.sock: self.close() + def Recv(self): reply = self.sock.recv(4096) msg = SadbMsg(reply) diff --git a/net/test/pf_key_test.py b/net/test/pf_key_test.py index 77cf82c..7791bd1 100755 --- a/net/test/pf_key_test.py +++ b/net/test/pf_key_test.py @@ -34,6 +34,10 @@ class PfKeyTest(unittest.TestCase): self.pf_key = pf_key.PfKey() self.xfrm = xfrm.Xfrm() + def tearDown(self): + self.pf_key.close() + self.pf_key = None + def testAddDelSa(self): src4 = csocket.Sockaddr(("192.0.2.1", 0)) dst4 = csocket.Sockaddr(("192.0.2.2", 1)) |