openstack/python-cinderclient
Code Issues Proposed changes

Merge "Use suitable assert"

Browse Source
This commit is contained in:
Jenkins
2014-08-06 04:26:39 +00:00
committed by Gerrit Code Review
parent d77b6f8287 32373cc5fb
commit 6603a40db6
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cinderclient/tests/v1/test_limits.py
View File

@@ -77,49 +77,49 @@ class TestLimits(utils.TestCase):
l2 = limits.RateLimit("verb2", "uri2", "regex2", "value2", "remain2", l2 = limits.RateLimit("verb2", "uri2", "regex2", "value2", "remain2",
"unit2", "next2") "unit2", "next2")
for item in l.rate: for item in l.rate:
self.assertTrue(item in [l1, l2]) self.assertIn(item, [l1, l2])
class TestRateLimit(utils.TestCase): class TestRateLimit(utils.TestCase):
def test_equal(self): def test_equal(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit() l2 = _get_default_RateLimit()
self.assertTrue(l1 == l2) self.assertEqual(l1, l2)
def test_not_equal_verbs(self): def test_not_equal_verbs(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(verb="verb2") l2 = _get_default_RateLimit(verb="verb2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_uris(self): def test_not_equal_uris(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(uri="uri2") l2 = _get_default_RateLimit(uri="uri2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_regexps(self): def test_not_equal_regexps(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(regex="regex2") l2 = _get_default_RateLimit(regex="regex2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_values(self): def test_not_equal_values(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(value="value2") l2 = _get_default_RateLimit(value="value2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_remains(self): def test_not_equal_remains(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(remain="remain2") l2 = _get_default_RateLimit(remain="remain2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_units(self): def test_not_equal_units(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(unit="unit2") l2 = _get_default_RateLimit(unit="unit2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_next_available(self): def test_not_equal_next_available(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(next_available="next2") l2 = _get_default_RateLimit(next_available="next2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_repr(self): def test_repr(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
@@ -130,17 +130,17 @@ class TestAbsoluteLimit(utils.TestCase):
def test_equal(self): def test_equal(self):
l1 = limits.AbsoluteLimit("name1", "value1") l1 = limits.AbsoluteLimit("name1", "value1")
l2 = limits.AbsoluteLimit("name1", "value1") l2 = limits.AbsoluteLimit("name1", "value1")
self.assertTrue(l1 == l2) self.assertEqual(l1, l2)
def test_not_equal_values(self): def test_not_equal_values(self):
l1 = limits.AbsoluteLimit("name1", "value1") l1 = limits.AbsoluteLimit("name1", "value1")
l2 = limits.AbsoluteLimit("name1", "value2") l2 = limits.AbsoluteLimit("name1", "value2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_names(self): def test_not_equal_names(self):
l1 = limits.AbsoluteLimit("name1", "value1") l1 = limits.AbsoluteLimit("name1", "value1")
l2 = limits.AbsoluteLimit("name2", "value1") l2 = limits.AbsoluteLimit("name2", "value1")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_repr(self): def test_repr(self):
l1 = limits.AbsoluteLimit("name1", "value1") l1 = limits.AbsoluteLimit("name1", "value1")

2
cinderclient/tests/v1/test_services.py
View File

@@ -71,5 +71,5 @@ class ServicesTest(utils.TestCase):
values = {"host": "host1", 'binary': 'cinder-volume', values = {"host": "host1", 'binary': 'cinder-volume',
"disabled_reason": "disable bad host"} "disabled_reason": "disable bad host"}
cs.assert_called('PUT', '/os-services/disable-log-reason', values) cs.assert_called('PUT', '/os-services/disable-log-reason', values)
self.assertTrue(isinstance(s, services.Service)) self.assertIsInstance(s, services.Service)
self.assertEqual(s.status, 'disabled') self.assertEqual(s.status, 'disabled')

24
cinderclient/tests/v2/test_limits.py
View File

@@ -77,49 +77,49 @@ class TestLimits(utils.TestCase):
l2 = limits.RateLimit("verb2", "uri2", "regex2", "value2", "remain2", l2 = limits.RateLimit("verb2", "uri2", "regex2", "value2", "remain2",
"unit2", "next2") "unit2", "next2")
for item in l.rate: for item in l.rate:
self.assertTrue(item in [l1, l2]) self.assertIn(item, [l1, l2])
class TestRateLimit(utils.TestCase): class TestRateLimit(utils.TestCase):
def test_equal(self): def test_equal(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit() l2 = _get_default_RateLimit()
self.assertTrue(l1 == l2) self.assertEqual(l1, l2)
def test_not_equal_verbs(self): def test_not_equal_verbs(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(verb="verb2") l2 = _get_default_RateLimit(verb="verb2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_uris(self): def test_not_equal_uris(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(uri="uri2") l2 = _get_default_RateLimit(uri="uri2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_regexps(self): def test_not_equal_regexps(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(regex="regex2") l2 = _get_default_RateLimit(regex="regex2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_values(self): def test_not_equal_values(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(value="value2") l2 = _get_default_RateLimit(value="value2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_remains(self): def test_not_equal_remains(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(remain="remain2") l2 = _get_default_RateLimit(remain="remain2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_units(self): def test_not_equal_units(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(unit="unit2") l2 = _get_default_RateLimit(unit="unit2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_next_available(self): def test_not_equal_next_available(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
l2 = _get_default_RateLimit(next_available="next2") l2 = _get_default_RateLimit(next_available="next2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_repr(self): def test_repr(self):
l1 = _get_default_RateLimit() l1 = _get_default_RateLimit()
@@ -130,17 +130,17 @@ class TestAbsoluteLimit(utils.TestCase):
def test_equal(self): def test_equal(self):
l1 = limits.AbsoluteLimit("name1", "value1") l1 = limits.AbsoluteLimit("name1", "value1")
l2 = limits.AbsoluteLimit("name1", "value1") l2 = limits.AbsoluteLimit("name1", "value1")
self.assertTrue(l1 == l2) self.assertEqual(l1, l2)
def test_not_equal_values(self): def test_not_equal_values(self):
l1 = limits.AbsoluteLimit("name1", "value1") l1 = limits.AbsoluteLimit("name1", "value1")
l2 = limits.AbsoluteLimit("name1", "value2") l2 = limits.AbsoluteLimit("name1", "value2")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_not_equal_names(self): def test_not_equal_names(self):
l1 = limits.AbsoluteLimit("name1", "value1") l1 = limits.AbsoluteLimit("name1", "value1")
l2 = limits.AbsoluteLimit("name2", "value1") l2 = limits.AbsoluteLimit("name2", "value1")
self.assertFalse(l1 == l2) self.assertNotEqual(l1, l2)
def test_repr(self): def test_repr(self):
l1 = limits.AbsoluteLimit("name1", "value1") l1 = limits.AbsoluteLimit("name1", "value1")

2
cinderclient/tests/v2/test_services.py
View File

@@ -71,5 +71,5 @@ class ServicesTest(utils.TestCase):
values = {"host": "host1", 'binary': 'cinder-volume', values = {"host": "host1", 'binary': 'cinder-volume',
"disabled_reason": "disable bad host"} "disabled_reason": "disable bad host"}
cs.assert_called('PUT', '/os-services/disable-log-reason', values) cs.assert_called('PUT', '/os-services/disable-log-reason', values)
self.assertTrue(isinstance(s, services.Service)) self.assertIsInstance(s, services.Service)
self.assertEqual(s.status, 'disabled') self.assertEqual(s.status, 'disabled')