From: Jiaying Ren <jiaying.ren@umcloud.com>
Date: Fri, 26 May 2017 10:06:21 +0000 (+0800)
Subject: rgw: fix test_multi.py default config file path
X-Git-Tag: v12.1.0~57^2~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0d88b09efe0afdf8e1fa4ff46d6aa8543b44a50;p=ceph.git

rgw: fix test_multi.py default config file path

$ python test_multi.py --num-zonegroups=2 --num-zones 2 --gateways-per-zone 1
Traceback (most recent call last):
  File "test_multi.py", line 315, in <module>
      init(True)
        File "test_multi.py", line 162, in init
	    path = tpath('test_multi.conf')
	    NameError: global name 'tpath' is not defined

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
---

diff --git a/src/test/rgw/test_multi.py b/src/test/rgw/test_multi.py
index e8bd5f127122..e380acc99038 100644
--- a/src/test/rgw/test_multi.py
+++ b/src/test/rgw/test_multi.py
@@ -159,7 +159,7 @@ def init(parse_args):
     try:
         path = os.environ['RGW_MULTI_TEST_CONF']
     except KeyError:
-        path = tpath('test_multi.conf')
+        path = test_path + 'test_multi.conf'
 
     try:
         with open(path) as f: