Skip to content

Commit 9290950

Browse files
committed
use unique directory to mount redis.sock
Signed-off-by: Guohan Lu <[email protected]>
1 parent 7d1b09e commit 9290950

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

tests/conftest.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ def __init__(self, name=None, keeptb=False):
144144
self.rtd = ['fpmsyncd', 'zebra']
145145
self.teamd = ['teamsyncd', 'teammgrd']
146146
self.alld = self.basicd + self.swssd + self.syncd + self.rtd + self.teamd
147-
self.mount = "/var/run/redis-vs"
148-
self.redis_sock = self.mount + '/' + "redis.sock"
149147
self.client = docker.from_env()
150148

151149
self.ctn = None
@@ -191,6 +189,11 @@ def __init__(self, name=None, keeptb=False):
191189
server = VirtualServer(self.ctn_sw.name, self.ctn_sw_pid, i)
192190
self.servers.append(server)
193191

192+
# mount redis to base to unique directory
193+
self.mount = "/var/run/redis-vs/{}".format(self.ctn_sw.name)
194+
os.system("mkdir -p {}".format(self.mount))
195+
self.redis_sock = self.mount + '/' + "redis.sock"
196+
194197
# create virtual switch container
195198
self.ctn = self.client.containers.run('docker-sonic-vs', privileged=True, detach=True,
196199
network_mode="container:%s" % self.ctn_sw.name,
@@ -215,6 +218,7 @@ def destroy(self):
215218
if self.cleanup:
216219
self.ctn.remove(force=True)
217220
self.ctn_sw.remove(force=True)
221+
os.system("rm -rf {}".format(self.mount))
218222
for s in self.servers:
219223
s.destroy()
220224

0 commit comments

Comments
 (0)