Merge PR #28194 into master

* refs/pull/28194/head:
	test_volume_client: declare only one default for python version
	test_volume_client: don't shadow class variable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-06-20 06:27:04 -07:00
commit f26493cc25
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View File

@ -14,11 +14,12 @@ class TestVolumeClient(CephFSTestCase):
# One for looking at the global filesystem, one for being
# the VolumeClient, two for mounting the created shares
CLIENTS_REQUIRED = 4
py_version = 'python'
default_py_version = 'python'
def setUp(self):
CephFSTestCase.setUp(self)
self.py_version = self.ctx.config.get('overrides', {}).get('python', 'python')
self.py_version = self.ctx.config.get('overrides', {}).\
get('python', TestVolumeClient.default_py_version)
log.info("using python version: {python_version}".format(
python_version=self.py_version
))