]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/pull/15817/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:36:34 +0000 (21:36 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:36:34 +0000 (21:36 -0700)
* upstream/pull/15817/head:
  qa: wait for healthy cluster before testing pins

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
qa/tasks/cephfs/test_exports.py

index df16e1939734292ea7f7e1259197fbdffe8db3ca,7dcac713f0381099e0977d95a78c5c0411cb6d7c..774dd8ffe1ef274e6dc5a488609c53d75a1c23b4
@@@ -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()