From: Samuel Just <sjust@redhat.com>
Date: Sat, 14 Jan 2017 00:14:46 +0000 (-0800)
Subject: test/pybind/test_rados.py: tolerate empty output from mon ping
X-Git-Tag: v12.0.0~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12934%2Fhead;p=ceph.git

test/pybind/test_rados.py: tolerate empty output from mon ping

Fixes: http://tracker.ceph.com/issues/18529
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/test/pybind/test_rados.py b/src/test/pybind/test_rados.py
index 6a70f12daaf..50b09053cdd 100644
--- a/src/test/pybind/test_rados.py
+++ b/src/test/pybind/test_rados.py
@@ -144,7 +144,10 @@ class TestRados(object):
         ret, buf, out = self.rados.mon_command(json.dumps(cmd), b'')
         for mon in json.loads(buf.decode('utf8'))['mons']:
             while True:
-                buf = json.loads(self.rados.ping_monitor(mon['name']))
+                output = self.rados.ping_monitor(mon['name'])
+                if output is None:
+                    continue
+                buf = json.loads(output)
                 if buf.get('health'):
                     break