From 057a32922e8df0319a1a197d1375d9ab4e5b6827 Mon Sep 17 00:00:00 2001 From: lguohan Date: Wed, 31 Oct 2018 12:24:59 -0700 Subject: [PATCH] [vstest]: change the redis mount point when --dvsname is provided. (#663) unify the redis mountpoint to /var/run/redis-vs/{base-container-name} user can use --keeptb to create a testbed and later use --dvsname to rerun test on the testbed. In this case, we need to use same redis mount point --- tests/README.md | 2 +- tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/README.md b/tests/README.md index 7e0d27233e71..9add6a87b9d3 100644 --- a/tests/README.md +++ b/tests/README.md @@ -47,7 +47,7 @@ persists. ``` docker run --privileged -id --name sw debian bash sudo ./create_vnet.sh sw - docker run --privileged -v /var/run/redis-vs:/var/run/redis --network container:sw -d --name vs docker-sonic-vs + docker run --privileged -v /var/run/redis-vs/sw:/var/run/redis --network container:sw -d --name vs docker-sonic-vs ``` - Run test using the existing vs container diff --git a/tests/conftest.py b/tests/conftest.py index 0d12d587ab2d..5e04f2ebb902 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -176,7 +176,7 @@ def __init__(self, name=None, keeptb=False): server = VirtualServer(ctn_sw_name, self.ctn_sw_pid, i) self.servers.append(server) - self.mount = "/var/run/redis-vs/" + self.mount = "/var/run/redis-vs/{}".format(ctn_sw_name) self.restart() else: