openstack/python-manilaclient
Code Issues Proposed changes

Fix failed to import test module

Browse Source 
The wrap @testtools.skipUnless cause the base class
SnapshotAccessReadBase to be the <type 'function'>,
However, it should be <type 'type'>, this cause the
functional test unbale to import the test module.

Closes-bug: #1769633
Change-Id: I98a296d009e64d6afab02a53bd1af878f78c4321
This commit is contained in:
junboli
2018-05-07 01:57:25 +08:00
parent 4197a71623
commit 9dad727aef
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manilaclient/tests/functional/test_snapshot_access.py
View File

@@ -22,9 +22,6 @@ from manilaclient.tests.functional import utils
CONF = config.CONF CONF = config.CONF
@testtools.skipUnless(CONF.run_snapshot_tests and
CONF.run_mount_snapshot_tests,
"Snapshots or mountable snapshots tests are disabled.")
@utils.skip_if_microversion_not_supported('2.32') @utils.skip_if_microversion_not_supported('2.32')
class SnapshotAccessReadBase(base.BaseTestCase): class SnapshotAccessReadBase(base.BaseTestCase):
protocol = None protocol = None
@@ -146,22 +143,37 @@ class SnapshotAccessReadBase(base.BaseTestCase):
snapshot['id'], 'cert', self.access_to['cert'][0]) snapshot['id'], 'cert', self.access_to['cert'][0])
@testtools.skipUnless(CONF.run_snapshot_tests and
CONF.run_mount_snapshot_tests,
"Snapshots or mountable snapshots tests are disabled.")
class NFSSnapshotAccessTest(SnapshotAccessReadBase): class NFSSnapshotAccessTest(SnapshotAccessReadBase):
protocol = 'nfs' protocol = 'nfs'
@testtools.skipUnless(CONF.run_snapshot_tests and
CONF.run_mount_snapshot_tests,
"Snapshots or mountable snapshots tests are disabled.")
class CIFSSnapshotAccessTest(SnapshotAccessReadBase): class CIFSSnapshotAccessTest(SnapshotAccessReadBase):
protocol = 'cifs' protocol = 'cifs'
@testtools.skipUnless(CONF.run_snapshot_tests and
CONF.run_mount_snapshot_tests,
"Snapshots or mountable snapshots tests are disabled.")
class GlusterFSSnapshotAccessTest(SnapshotAccessReadBase): class GlusterFSSnapshotAccessTest(SnapshotAccessReadBase):
protocol = 'glusterfs' protocol = 'glusterfs'
@testtools.skipUnless(CONF.run_snapshot_tests and
CONF.run_mount_snapshot_tests,
"Snapshots or mountable snapshots tests are disabled.")
class HDFSSnapshotAccessTest(SnapshotAccessReadBase): class HDFSSnapshotAccessTest(SnapshotAccessReadBase):
protocol = 'hdfs' protocol = 'hdfs'
@testtools.skipUnless(CONF.run_snapshot_tests and
CONF.run_mount_snapshot_tests,
"Snapshots or mountable snapshots tests are disabled.")
class MAPRFSSnapshotAccessTest(SnapshotAccessReadBase): class MAPRFSSnapshotAccessTest(SnapshotAccessReadBase):
protocol = 'maprfs' protocol = 'maprfs'