From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 2 Dec 2019 22:55:25 +0000 (-0800)
Subject: rgw: test-multi: craft admin command line options differently
X-Git-Tag: v15.1.0~22^2~126
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca4b319bcf9fbef52ae3c0fda2aca09ca7394c0e;p=ceph.git

rgw: test-multi: craft admin command line options differently

The problem was specifically with the "--rgw-cache-enabled false" param. This
doesn't work like that anymore, need to either pass --rgw-cache-enabled=false,
or --no-rgw-cache-enabled.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/test/rgw/test_multi.py b/src/test/rgw/test_multi.py
index af45f3ab000a..106f6d0f321b 100644
--- a/src/test/rgw/test_multi.py
+++ b/src/test/rgw/test_multi.py
@@ -61,10 +61,10 @@ class Cluster(multisite.Cluster):
         cmd = [test_path + 'test-rgw-call.sh', 'call_rgw_admin', self.cluster_id]
         if args:
             cmd += args
-        cmd += ['--debug-rgw', str(kwargs.pop('debug_rgw', 0))]
-        cmd += ['--debug-ms', str(kwargs.pop('debug_ms', 0))]
+        cmd += ['--debug-rgw=' + str(kwargs.pop('debug_rgw', 0))]
+        cmd += ['--debug-ms=' + str(kwargs.pop('debug_ms', 0))]
         if kwargs.pop('read_only', False):
-            cmd += ['--rgw-cache-enabled', 'false']
+            cmd += ['--rgw-cache-enabled=false']
         return bash(cmd, **kwargs)
 
     def start(self):