diff --git a/cinderlib/tests/functional/test_basic.py b/cinderlib/tests/functional/test_basic.py index 451bfb6..026f139 100644 --- a/cinderlib/tests/functional/test_basic.py +++ b/cinderlib/tests/functional/test_basic.py @@ -49,7 +49,7 @@ class BaseFunctTestCase(base_tests.unittest.TestCase): for option in driver_info['driver_options']: self.assertIsInstance(option['type'], expected_type) if is_v2: - self.assertTrue('type_class' in option['type']) + self.assertIn('type_class', option['type']) else: for v in option.values(): self.assertIsInstance(v, str) diff --git a/cinderlib/tests/unit/persistence/test_memory.py b/cinderlib/tests/unit/persistence/test_memory.py index 4a93938..3de1c4d 100644 --- a/cinderlib/tests/unit/persistence/test_memory.py +++ b/cinderlib/tests/unit/persistence/test_memory.py @@ -88,5 +88,5 @@ class TestMemoryPersistence(base.BasePersistenceTest): self.assertDictEqual({}, self.persistence.key_values) expected = [cinderlib.KeyValue('key', 'value')] self.persistence.set_key_value(expected[0]) - self.assertTrue('key' in self.persistence.key_values) + self.assertIn('key', self.persistence.key_values) self.assertEqual(expected, list(self.persistence.key_values.values())) diff --git a/cinderlib/tests/unit/test_cinderlib.py b/cinderlib/tests/unit/test_cinderlib.py index cd79258..ccf7925 100644 --- a/cinderlib/tests/unit/test_cinderlib.py +++ b/cinderlib/tests/unit/test_cinderlib.py @@ -52,7 +52,7 @@ class TestCinderlib(base.BaseTest): for option in driver_info['driver_options']: self.assertIsInstance(option['type'], expected_type) if is_v2: - self.assertTrue('type_class' in option['type']) + self.assertIn('type_class', option['type']) else: for v in option.values(): self.assertIsInstance(v, str) diff --git a/test-requirements.txt b/test-requirements.txt index ac8ee6e..97d223b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. pbr>=5.4.1 # Apache-2.0 -hacking>=3.0.1,<3.2.0 # Apache-2.0 +hacking>=4.0.0,<4.1.0 # Apache-2.0 coverage!=4.4,>=4.1 # Apache-2.0 ddt>=1.2.1 # MIT oslotest>=3.2.0 # Apache-2.0