openstack/cinder
Code Issues Proposed changes

Merge "Port test_quobyte to Python 3"

Browse Source
This commit is contained in:
Jenkins 2015-10-06 21:55:34 +00:00 committed by Gerrit Code Review
commit b85cbda2c4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/test_quobyte.py
View File

@ -102,9 +102,9 @@ class QuobyteDriverTestCase(test.TestCase):
callableObj(*args, **kwargs) callableObj(*args, **kwargs)
except Exception as exc: except Exception as exc:
caught = True caught = True
self.assertEqual(excClass, type(exc), self.assertIsInstance(exc, excClass,
'Wrong exception caught: %s Stacktrace: %s' % 'Wrong exception caught: %s Stacktrace: %s' %
(exc, traceback.format_exc())) (exc, traceback.format_exc()))
self.assertIn(msg, six.text_type(exc)) self.assertIn(msg, six.text_type(exc))
if not caught: if not caught:

1
tox.ini
View File

@ -86,6 +86,7 @@ commands =
cinder.tests.unit.test_nimble \ cinder.tests.unit.test_nimble \
cinder.tests.unit.test_pure \ cinder.tests.unit.test_pure \
cinder.tests.unit.test_qos_specs \ cinder.tests.unit.test_qos_specs \
cinder.tests.unit.test_quobyte \
cinder.tests.unit.test_quota \ cinder.tests.unit.test_quota \
cinder.tests.unit.test_rbd \ cinder.tests.unit.test_rbd \
cinder.tests.unit.test_remotefs \ cinder.tests.unit.test_remotefs \