From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 14 Aug 2019 07:08:24 +0000 (+0200)
Subject: tests: update test_mgr_is_up()
X-Git-Tag: v5.0.0alpha1~170
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=05686509f3744cce26a590d49c1b0300655d167a;p=ceph-ansible.git

tests: update test_mgr_is_up()

the data structure has changed in octopus:

```
    "mgrmap": {
        "available": true,
        "modules": [
            "dashboard",
            "prometheus"
        ],
        "num_standbys": 0,
        "services": {
            "prometheus": "http://mgr0:9283/"
        }
    },
```

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/tests/functional/tests/mgr/test_mgr.py b/tests/functional/tests/mgr/test_mgr.py
index 167640e1a..d52c6fdc0 100644
--- a/tests/functional/tests/mgr/test_mgr.py
+++ b/tests/functional/tests/mgr/test_mgr.py
@@ -36,9 +36,5 @@ class TestMGRs(object):
         )
         output_raw = host.check_output(cmd)
         output_json = json.loads(output_raw)
-        daemons = output_json['mgrmap']['active_name']
-        standbys = [i['name'] for i in output_json['mgrmap']['standbys']]
-        result = hostname in daemons
-        if not result:
-            result = hostname in standbys
-        assert result
+
+        assert output_json['mgrmap']['available']