summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2023-03-25 00:48:18 -0700
committerMaciej Żenczykowski <maze@google.com>2023-03-25 02:08:42 -0700
commit5c9d3400b6760386e50dbbe4bea6a18b14a6589e (patch)
treef8995b5637505501788e91715e616ed6bec5a26b
parenta334b72ca33bca98ab11859730d976deb15c1dc8 (diff)
downloadtests-5c9d3400b6760386e50dbbe4bea6a18b14a6589e.tar.gz
net-test: close() fixes for pf_key_test.py
Test: on UML Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I5130aff5105a22eb0ca62380782b2cf16684437f
-rwxr-xr-xnet/test/pf_key.py7
-rwxr-xr-xnet/test/pf_key_test.py4
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))