From 9b4955509cfd6f01740ad61194d529a0b89fe334 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sun, 21 Oct 2018 04:45:21 +0000 Subject: [PATCH] make sure delete the srv namespace after test change __del__ to destroy function Signed-off-by: Guohan Lu --- tests/conftest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index ca7588cf57af..c9fa0e4eb955 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -111,14 +111,14 @@ def __init__(self, ctn_name, pid, i): ensure_system("nsenter -t %d -n ip link set arp off dev %s" % (pid, self.vifname)) ensure_system("nsenter -t %d -n sysctl -w net.ipv6.conf.%s.disable_ipv6=1" % (pid, self.vifname)) - def __del__(self): + def destroy(self): if self.cleanup: pids = subprocess.check_output("ip netns pids %s" % (self.nsname), shell=True) if pids: for pid in pids.split('\n'): if len(pid) > 0: os.system("kill %s" % int(pid)) - os.system("ip netns delete %s" % self.nsname) + ensure_system("ip netns delete %s" % self.nsname) def runcmd(self, cmd): return os.system("ip netns exec %s %s" % (self.nsname, cmd)) @@ -211,7 +211,7 @@ def destroy(self): self.ctn.remove(force=True) self.ctn_sw.remove(force=True) for s in self.servers: - del(s) + s.destroy() def check_ready(self, timeout=30): '''check if all processes in the dvs is ready'''