From: John Spray Date: Wed, 11 May 2016 14:08:29 +0000 (-0500) Subject: Merge pull request #975 from xiaoxichen/prefix X-Git-Tag: v11.1.1~58^2^2~209 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ec26a9e16565a36bbdec6fc2a0718fcc6ca55a5;p=ceph.git Merge pull request #975 from xiaoxichen/prefix fs/volume_client: exercise the configurable prefix and ns_prefix. Reviewed-by: John Spray --- 4ec26a9e16565a36bbdec6fc2a0718fcc6ca55a5 diff --cc tasks/cephfs/test_volume_client.py index 57eb4aac4f9,7d358ed7c7d..58f62f2807b --- a/tasks/cephfs/test_volume_client.py +++ b/tasks/cephfs/test_volume_client.py @@@ -11,12 -11,16 +11,16 @@@ log = logging.getLogger(__name__ class TestVolumeClient(CephFSTestCase): # One for looking at the global filesystem, one for being - # the VolumeClient, one for mounting the created shares - CLIENTS_REQUIRED = 3 + # the VolumeClient, two for mounting the created shares + CLIENTS_REQUIRED = 4 - def _volume_client_python(self, client, script): + def _volume_client_python(self, client, script, vol_prefix=None, ns_prefix=None): # Can't dedent this *and* the script we pass in, because they might have different # levels of indentation to begin with, so leave this string zero-indented + if vol_prefix: + vol_prefix = "\"" + vol_prefix + "\"" + if ns_prefix: + ns_prefix = "\"" + ns_prefix + "\"" return client.run_python(""" from ceph_volume_client import CephFSVolumeClient, VolumePath import logging