From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 4 May 2020 20:38:34 +0000 (-0400)
Subject: test/rgw: SystemObject.json_command no longer trims json output
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1351^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cebce38f1c699b52127ba591c1754423ef9551af;p=ceph-ci.git

test/rgw: SystemObject.json_command no longer trims json output

this was a workaround for 'period commit' commands that used to write
the "Sending period to new master zone" line to stdout

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py
index a79c42909b1..d591f340e64 100644
--- a/src/test/rgw/rgw_multi/multisite.py
+++ b/src/test/rgw/rgw_multi/multisite.py
@@ -72,8 +72,7 @@ class SystemObject:
         data and retcode """
         s, r = self.command(cluster, cmd, args or [], **kwargs)
         if r == 0:
-            output = s[s.find('{'):] # trim extra output before json
-            data = json.loads(output)
+            data = json.loads(s)
             self.load_from_json(data)
             self.data = data
         return self.data, r