From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Sep 2019 15:47:03 +0000 (-0500)
Subject: test/pybind/test_rados: fix accidental mon tell test
X-Git-Tag: v15.1.0~1323^2~16
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=215d267fa66f7d6e9ac04a82ef2331f68a09ffa3;p=ceph-ci.git

test/pybind/test_rados: fix accidental mon tell test

This test assumed 'mon dump' (a CLI command) would work when targetted at
a specific mon (i.e., a tell command).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/pybind/test_rados.py b/src/test/pybind/test_rados.py
index 8d65942f4a8..967fc0adae5 100644
--- a/src/test/pybind/test_rados.py
+++ b/src/test/pybind/test_rados.py
@@ -1079,25 +1079,26 @@ class TestCommand(object):
         eq(len(buf), 0)
         del cmd['epoch']
 
-        # send to specific target by name
+        # send to specific target by name, rank
+        cmd = {"prefix": "version"}
+
         target = d['mons'][0]['name']
         print(target)
         ret, buf, errs = self.rados.mon_command(json.dumps(cmd), b'', timeout=30,
                                                 target=target)
         eq(ret, 0)
         assert len(buf) > 0
-        d = json.loads(buf.decode("utf-8"))
-        assert('epoch' in d)
+        e = json.loads(buf.decode("utf-8"))
+        assert('release' in e)
 
-        # and by rank
         target = d['mons'][0]['rank']
         print(target)
         ret, buf, errs = self.rados.mon_command(json.dumps(cmd), b'', timeout=30,
                                                 target=target)
         eq(ret, 0)
         assert len(buf) > 0
-        d = json.loads(buf.decode("utf-8"))
-        assert('epoch' in d)
+        e = json.loads(buf.decode("utf-8"))
+        assert('release' in e)
 
     def test_osd_bench(self):
         cmd = dict(prefix='bench', size=4096, count=8192)