From cebce38f1c699b52127ba591c1754423ef9551af Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 4 May 2020 16:38:34 -0400 Subject: [PATCH] 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 --- src/test/rgw/rgw_multi/multisite.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py index a79c42909b16f..d591f340e64cf 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 -- 2.39.5