From 929095077300b5d39cbc50adf35de3a6a6b64dde Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sun, 21 Oct 2018 17:58:58 +0000 Subject: [PATCH] use unique directory to mount redis.sock Signed-off-by: Guohan Lu --- tests/conftest.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index fbd7a3817972..900db1a46937 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -144,8 +144,6 @@ def __init__(self, name=None, keeptb=False): self.rtd = ['fpmsyncd', 'zebra'] self.teamd = ['teamsyncd', 'teammgrd'] self.alld = self.basicd + self.swssd + self.syncd + self.rtd + self.teamd - self.mount = "/var/run/redis-vs" - self.redis_sock = self.mount + '/' + "redis.sock" self.client = docker.from_env() self.ctn = None @@ -191,6 +189,11 @@ def __init__(self, name=None, keeptb=False): server = VirtualServer(self.ctn_sw.name, self.ctn_sw_pid, i) self.servers.append(server) + # mount redis to base to unique directory + self.mount = "/var/run/redis-vs/{}".format(self.ctn_sw.name) + os.system("mkdir -p {}".format(self.mount)) + self.redis_sock = self.mount + '/' + "redis.sock" + # create virtual switch container self.ctn = self.client.containers.run('docker-sonic-vs', privileged=True, detach=True, network_mode="container:%s" % self.ctn_sw.name, @@ -215,6 +218,7 @@ def destroy(self): if self.cleanup: self.ctn.remove(force=True) self.ctn_sw.remove(force=True) + os.system("rm -rf {}".format(self.mount)) for s in self.servers: s.destroy()