From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Jul 2017 04:36:34 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/15817/head' into master
X-Git-Tag: v12.1.1~152
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97cdb1e34ae9e3923eeb9a03027dd7f499cd5f9d;p=ceph.git

Merge remote-tracking branch 'upstream/pull/15817/head' into master

* upstream/pull/15817/head:
  qa: wait for healthy cluster before testing pins

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

97cdb1e34ae9e3923eeb9a03027dd7f499cd5f9d
diff --cc qa/tasks/cephfs/test_exports.py
index df16e1939734,7dcac713f038..774dd8ffe1ef
--- a/qa/tasks/cephfs/test_exports.py
+++ b/qa/tasks/cephfs/test_exports.py
@@@ -23,7 -23,9 +23,8 @@@ class TestExports(CephFSTestCase)
          raise RuntimeError("rank {0} failed to reach desired subtree state", rank)
  
      def test_export_pin(self):
 -        self.fs.set_allow_multimds(True)
          self.fs.set_max_mds(2)
+         self.fs.wait_for_daemons()
  
          status = self.fs.status()