openstack/zaqar
Code Issues Proposed changes

Merge "Use assertEqual/GreaterEqual/LessEqual"

Browse Source
This commit is contained in:
Jenkins 2016-06-08 14:30:31 +00:00 committed by Gerrit Code Review
commit e3e9f22e3b
10 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zaqar/tests/functional/base.py
View File

@ -239,7 +239,7 @@ class FunctionalTestBase(testing.TestBase):
"""
msg = ('More Messages returned than allowed: expected count = {0}'
', actual count = {1}'.format(expectedCount, actualCount))
self.assertTrue(actualCount <= expectedCount, msg)
self.assertLessEqual(actualCount, expectedCount, msg)
def assertQueueStats(self, result_json, claimed):
"""Checks the Queue Stats results
@ -289,8 +289,9 @@ class FunctionalTestBase(testing.TestBase):
# Verify that age has valid values
age = message['age']
self.assertTrue(0 <= age <= self.limits.max_message_ttl,
msg='Invalid Age {0}'.format(age))
msg = 'Invalid Age {0}'.format(age)
self.assertLessEqual(0, age, msg)
self.assertLessEqual(age, self.limits.max_message_ttl, msg)
# Verify that GET on href returns 200
path = message['href']
@ -312,7 +313,8 @@ class FunctionalTestBase(testing.TestBase):
msg = ('Invalid Time Delta {0}, Created time {1}, Now {2}'
.format(delta, created_time, now))
self.assertTrue(0 <= delta <= 6000, msg)
self.assertLessEqual(0, delta, msg)
self.assertLessEqual(delta, 6000, msg)
@six.add_metaclass(abc.ABCMeta)

2
zaqar/tests/tempest_plugin/tests/v1/test_claims.py
View File

@ -89,7 +89,7 @@ class TestClaims(base.BaseV1MessagingTest):
# Verify claim ttl >= updated ttl value
_, body = self.client.query_claim(claim_uri)
updated_claim_ttl = body["ttl"]
self.assertTrue(updated_claim_ttl >= claim_ttl)
self.assertGreaterEqual(updated_claim_ttl, claim_ttl)
# Delete Claimed message
self.client.delete_messages(claimed_message_uri)

2
zaqar/tests/tempest_plugin/tests/v1_1/test_claims.py
View File

@ -89,7 +89,7 @@ class TestClaims(base.BaseV11MessagingTest):
# Verify claim ttl >= updated ttl value
_, body = self.client.query_claim(claim_uri)
updated_claim_ttl = body["ttl"]
self.assertTrue(updated_claim_ttl >= claim_ttl)
self.assertGreaterEqual(updated_claim_ttl, claim_ttl)
# Delete Claimed message
self.client.delete_messages(claimed_message_uri)

2
zaqar/tests/tempest_plugin/tests/v2/test_claims.py
View File

@ -89,7 +89,7 @@ class TestClaims(base.BaseV2MessagingTest):
# Verify claim ttl >= updated ttl value
_, body = self.client.query_claim(claim_uri)
updated_claim_ttl = body["ttl"]
self.assertTrue(updated_claim_ttl >= claim_ttl)
self.assertGreaterEqual(updated_claim_ttl, claim_ttl)
# Delete Claimed message
self.client.delete_messages(claimed_message_uri)

4
zaqar/tests/unit/transport/wsgi/v1/test_pools.py
View File

@ -247,7 +247,7 @@ class TestPoolsMongoDB(base.V1Base):
result = self.simulate_get(self.url_prefix + '/pools')
results = jsonutils.loads(result[0])
self.assertEqual(falcon.HTTP_200, self.srmock.status)
self.assertTrue(len(results['pools']) == 0)
self.assertEqual(0, len(results['pools']))
self.assertIn('links', results)
def _listing_test(self, count=10, limit=10,
@ -292,7 +292,7 @@ class TestPoolsMongoDB(base.V1Base):
else:
# NOTE(jeffrey4l): when limit >= count, there will be no
# pools in the 2nd page.
self.assertTrue(len(next_pool_list) == 0)
self.assertEqual(0, len(next_pool_list))
self.assertEqual(min(limit, count), len(pool_list))
for s in pool_list + next_pool_list:

4
zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py
View File

@ -249,7 +249,7 @@ class TestFlavorsMongoDB(base.V1_1Base):
result = self.simulate_get(self.url_prefix + '/flavors')
results = jsonutils.loads(result[0])
self.assertEqual(falcon.HTTP_200, self.srmock.status)
self.assertTrue(len(results['flavors']) == 0)
self.assertEqual(0, len(results['flavors']))
self.assertIn('links', results)
def _listing_test(self, count=10, limit=10,
@ -291,7 +291,7 @@ class TestFlavorsMongoDB(base.V1_1Base):
self.assertEqual(min(limit, count-limit),
len(next_flavors_list))
else:
self.assertTrue(len(next_flavors_list) == 0)
self.assertEqual(0, len(next_flavors_list))
self.assertEqual(min(limit, count), len(flavors_list))
for i, s in enumerate(flavors_list + next_flavors_list):

4
zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py
View File

@ -266,7 +266,7 @@ class TestPoolsMongoDB(base.V1_1Base):
result = self.simulate_get(self.url_prefix + '/pools')
results = jsonutils.loads(result[0])
self.assertEqual(falcon.HTTP_200, self.srmock.status)
self.assertTrue(len(results['pools']) == 0)
self.assertEqual(0, len(results['pools']))
self.assertIn('links', results)
def _listing_test(self, count=10, limit=10,
@ -311,7 +311,7 @@ class TestPoolsMongoDB(base.V1_1Base):
else:
# NOTE(jeffrey4l): when limit >= count, there will be no
# pools in the 2nd page.
self.assertTrue(len(next_pool_list) == 0)
self.assertEqual(0, len(next_pool_list))
self.assertEqual(min(limit, count), len(pool_list))
for s in pool_list + next_pool_list:

4
zaqar/tests/unit/transport/wsgi/v2_0/test_flavors.py
View File

@ -246,7 +246,7 @@ class TestFlavorsMongoDB(base.V2Base):
result = self.simulate_get(self.url_prefix + '/flavors')
results = jsonutils.loads(result[0])
self.assertEqual(falcon.HTTP_200, self.srmock.status)
self.assertTrue(len(results['flavors']) == 0)
self.assertEqual(0, len(results['flavors']))
self.assertIn('links', results)
def _listing_test(self, count=10, limit=10,
@ -288,7 +288,7 @@ class TestFlavorsMongoDB(base.V2Base):
self.assertEqual(min(limit, count-limit),
len(next_flavors_list))
else:
self.assertTrue(len(next_flavors_list) == 0)
self.assertEqual(0, len(next_flavors_list))
self.assertEqual(min(limit, count), len(flavors_list))
for i, s in enumerate(flavors_list + next_flavors_list):

4
zaqar/tests/unit/transport/wsgi/v2_0/test_pools.py
View File

@ -269,7 +269,7 @@ class TestPoolsMongoDB(base.V2Base):
result = self.simulate_get(self.url_prefix + '/pools')
results = jsonutils.loads(result[0])
self.assertEqual(falcon.HTTP_200, self.srmock.status)
self.assertTrue(len(results['pools']) == 0)
self.assertEqual(0, len(results['pools']))
self.assertIn('links', results)
def _listing_test(self, count=10, limit=10,
@ -314,7 +314,7 @@ class TestPoolsMongoDB(base.V2Base):
else:
# NOTE(jeffrey4l): when limit >= count, there will be no
# pools in the 2nd page.
self.assertTrue(len(next_pool_list) == 0)
self.assertEqual(0, len(next_pool_list))
self.assertEqual(min(limit, count), len(pool_list))
for s in pool_list + next_pool_list:

2
zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py
View File

@ -171,7 +171,7 @@ class TestSubscriptionsMongoDB(base.V2Base):
self.assertEqual(min(limit, count-limit),
len(next_subscriptions_list))
else:
self.assertTrue(len(next_subscriptions_list) == 0)
self.assertEqual(0, len(next_subscriptions_list))
self.assertEqual(min(limit, count), len(subscriptions_list))