openstack/zaqar
Code Issues Proposed changes

Merge "Replace deprecated method aliases in tests"

Browse Source
This commit is contained in:
Jenkins
2013-10-09 14:17:21 +00:00
committed by Gerrit Code Review
parent c9b0f65f18 8d142c66ff
commit 2273b2f587
16 changed files with 244 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
marconi/tests/queues/storage/base.py
View File

@@ -77,19 +77,19 @@ class QueueControllerTest(ControllerBaseTest):
detailed=True)
queues = list(next(interaction))
self.assertEquals(all(map(lambda queue:
'name' in queue and
'metadata' in queue, queues)), True)
self.assertEquals(len(queues), 10)
self.assertEqual(all(map(lambda queue:
'name' in queue and
'metadata' in queue, queues)), True)
self.assertEqual(len(queues), 10)
interaction = self.controller.list(project=project,
marker=next(interaction))
queues = list(next(interaction))
self.assertEquals(all(map(lambda queue:
'name' in queue and
'metadata' not in queue, queues)), True)
self.assertEquals(len(queues), 5)
self.assertEqual(all(map(lambda queue:
'name' in queue and
'metadata' not in queue, queues)), True)
self.assertEqual(len(queues), 5)
def test_queue_lifecycle(self):
# Test queue creation
@@ -102,7 +102,7 @@ class QueueControllerTest(ControllerBaseTest):
# Test queue retrieval
interaction = self.controller.list(project=self.project)
queue = list(next(interaction))[0]
self.assertEquals(queue['name'], 'test')
self.assertEqual(queue['name'], 'test')
# Test queue metadata retrieval
metadata = self.controller.get_metadata('test', project=self.project)
@@ -286,7 +286,7 @@ class MessageControllerTest(ControllerBaseTest):
project=self.project)
for idx, message in enumerate(messages_out):
self.assertEquals(message['body'], idx)
self.assertEqual(message['body'], idx)
self.controller.bulk_delete(self.queue_name, ids,
project=self.project)
@@ -386,7 +386,7 @@ class MessageControllerTest(ControllerBaseTest):
stats = self.queue_controller.stats(self.queue_name,
project=self.project)
self.assertEquals(stats['messages']['free'], 0)
self.assertEqual(stats['messages']['free'], 0)
def test_bad_id(self):
# NOTE(cpp-cabrera): A malformed ID should result in an empty
@@ -424,7 +424,7 @@ class MessageControllerTest(ControllerBaseTest):
marker=bad_marker)
messages = list(next(interaction))
self.assertEquals(messages, [])
self.assertEqual(messages, [])
class ClaimControllerTest(ControllerBaseTest):
@@ -462,7 +462,7 @@ class ClaimControllerTest(ControllerBaseTest):
limit=15)
messages = list(messages)
self.assertEquals(len(messages), 15)
self.assertEqual(len(messages), 15)
# Ensure Queue stats
countof = self.queue_controller.stats(self.queue_name,
@@ -476,10 +476,10 @@ class ClaimControllerTest(ControllerBaseTest):
project=self.project)
messages2 = list(messages2)
self.assertEquals(len(messages2), 15)
self.assertEquals(messages, messages2)
self.assertEquals(claim['ttl'], 70)
self.assertEquals(claim['id'], claim_id)
self.assertEqual(len(messages2), 15)
self.assertEqual(messages, messages2)
self.assertEqual(claim['ttl'], 70)
self.assertEqual(claim['id'], claim_id)
new_meta = {'ttl': 100, 'grace': 60}
self.controller.update(self.queue_name, claim_id,
@@ -490,15 +490,15 @@ class ClaimControllerTest(ControllerBaseTest):
project=self.project)
messages2 = list(messages2)
self.assertEquals(len(messages2), 15)
self.assertEqual(len(messages2), 15)
# TODO(zyuan): Add some tests to ensure the ttl is
# extended/not-extended.
for msg1, msg2 in zip(messages, messages2):
self.assertEquals(msg1['body'], msg2['body'])
self.assertEqual(msg1['body'], msg2['body'])
self.assertEquals(claim['ttl'], 100)
self.assertEquals(claim['id'], claim_id)
self.assertEqual(claim['ttl'], 100)
self.assertEqual(claim['id'], claim_id)
# Make sure delete works
self.controller.delete(self.queue_name, claim_id,
@@ -519,7 +519,7 @@ class ClaimControllerTest(ControllerBaseTest):
project=self.project)
for message in messages:
self.assertEquals(message['ttl'], 777)
self.assertEqual(message['ttl'], 777)
def test_extend_lifetime_with_grace_1(self):
_insert_fixtures(self.message_controller, self.queue_name,
@@ -532,7 +532,7 @@ class ClaimControllerTest(ControllerBaseTest):
project=self.project)
for message in messages:
self.assertEquals(message['ttl'], 800)
self.assertEqual(message['ttl'], 800)
def test_extend_lifetime_with_grace_2(self):
_insert_fixtures(self.message_controller, self.queue_name,
@@ -547,7 +547,7 @@ class ClaimControllerTest(ControllerBaseTest):
project=self.project)
for message in messages:
self.assertEquals(message['ttl'], 122)
self.assertEqual(message['ttl'], 122)
def test_do_not_extend_lifetime(self):
_insert_fixtures(self.message_controller, self.queue_name,
@@ -561,7 +561,7 @@ class ClaimControllerTest(ControllerBaseTest):
project=self.project)
for message in messages:
self.assertEquals(message['ttl'], 120)
self.assertEqual(message['ttl'], 120)
def test_expired_claim(self):
meta = {'ttl': 0, 'grace': 60}

2
tests/unit/proxy/storage/test_impl_mongodb.py
View File

@@ -30,7 +30,7 @@ class MongodbDriverTest(testing.TestBase):
def test_db_instance(self):
driver = mongodb.Driver()
db = driver.db
self.assertEquals(db.name, options.CFG.database)
self.assertEqual(db.name, options.CFG.database)
@testing.requires_mongodb

6
tests/unit/proxy/test_catalogue.py
View File

@@ -50,14 +50,14 @@ class CatalogueTest(base.TestBase):
def test_list_empty(self):
self.simulate_get('/v1/catalogue')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
@httpretty.activate
def test_simple(self):
queues = ['arakawa', 'bridge']
self.simulate_get('/v1/catalogue/' + queues[0])
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Create queues
for name in queues:
@@ -78,7 +78,7 @@ class CatalogueTest(base.TestBase):
self.assertEqual(data['name'], name)
self.assertEqual(data['partition'], self.partition_name)
self.assertEqual(data['host'], self.host)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
# delete queues, implicitly removing from catalogue
self.simulate_delete('/v1/queues/' + name)

36
tests/unit/proxy/test_partitions.py
View File

@@ -48,7 +48,7 @@ class PartitionTest(base.TestBase):
def test_simple(self):
# No partition
self.simulate_get(self.partition)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
doc = {'hosts': ['url'],
'weight': 10}
@@ -56,7 +56,7 @@ class PartitionTest(base.TestBase):
# Create
self.simulate_put(self.partition,
body=json.dumps(doc))
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
# Already exist
doc2 = copy.copy(doc)
@@ -64,25 +64,25 @@ class PartitionTest(base.TestBase):
self.simulate_put(self.partition,
body=json.dumps(doc2))
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Get
result = self.simulate_get(self.partition)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEquals(json.loads(result[0]), doc) # unchanged
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.assertEqual(json.loads(result[0]), doc) # unchanged
# Delete
self.simulate_delete(self.partition)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# No longer exist
self.simulate_get(self.partition)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
def test_listing(self):
# Empty
self.simulate_get(self.path)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Insert
for n in range(1, 11):
@@ -91,21 +91,21 @@ class PartitionTest(base.TestBase):
self.simulate_put(self.partition + str(n),
body=json.dumps(doc))
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
# List
result = self.simulate_get(self.path)
doc = json.loads(result[0])
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEquals(len(doc), 10)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.assertEqual(len(doc), 10)
for item in doc:
name = item.pop('name')
result = self.simulate_get(self.path + '/' + name)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.assertEquals(json.loads(result[0]), item)
self.assertEqual(json.loads(result[0]), item)
# Delete all
for n in range(1, 11):
@@ -113,12 +113,12 @@ class PartitionTest(base.TestBase):
# Back to empty
self.simulate_get(self.path)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
def test_bad_input(self):
# Not a JSON
self.simulate_put('/v1/partitions/avalon', body='{')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
# Bad fields
invalid_nodes = [1, {}, {'hosts': 1}, {'hosts': []}]
@@ -129,16 +129,16 @@ class PartitionTest(base.TestBase):
for doc in invalid_nodes + invalid_weights:
self.simulate_put('/v1/partitions/avalon',
body=json.dumps(doc))
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_fetch_nonexisting_partition_404s(self):
self.simulate_get('/v1/partition/no')
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
def test_patch_nonexisting_partition_404s(self):
doc = {'weight': 1}
self.simulate_patch('/v1/partition/no', body=json.dumps(doc))
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
def test_bad_json_on_put_raises_bad_request(self):
self.simulate_put('/v1/partitions/bad_json', body="")

24
tests/unit/proxy/test_queues.py
View File

@@ -45,7 +45,7 @@ class QueuesTest(base.TestBase):
for host, uri in zip(self.hosts, self.partitions):
doc = {'weight': 100, 'hosts': [host]}
self.simulate_put(uri, body=json.dumps(doc))
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
def tearDown(self):
for uri in self.partitions:
@@ -59,7 +59,7 @@ class QueuesTest(base.TestBase):
@ddt.data('get', 'head', 'delete')
def test_nonexistent_queue_404s_on(self, method):
getattr(self, 'simulate_' + method)('/v1/queues/no')
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
@httpretty.activate
def _mock_create_queue(self, queue_uri, status):
@@ -70,7 +70,7 @@ class QueuesTest(base.TestBase):
self.simulate_put(queue_uri)
expect = getattr(falcon, 'HTTP_%s' % status)
self.assertEquals(self.srmock.status, expect)
self.assertEqual(self.srmock.status, expect)
def test_put_queue_creates_catalogue_entry(self):
queue_uri = '/v1/queues/create'
@@ -80,12 +80,12 @@ class QueuesTest(base.TestBase):
# is it in the catalogue?
result = self.simulate_get(catalogue_uri)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
data = json.loads(result[0])
self.assertEquals(data['name'], 'create')
self.assertEqual(data['name'], 'create')
self.assertIn(data['partition'], self.partition_names)
self.assertIn(data['host'], self.hosts)
self.assertEquals(data['metadata'], {})
self.assertEqual(data['metadata'], {})
def test_put_queue_leaves_catalogue_alone_on_204(self):
queue_uri = '/v1/queues/existing'
@@ -104,7 +104,7 @@ class QueuesTest(base.TestBase):
# is it in the catalogue?
self.simulate_get(catalogue_uri)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
def test_put_does_not_duplicate_queues(self):
queue_uri = '/v1/queues/nodup'
@@ -113,11 +113,11 @@ class QueuesTest(base.TestBase):
for i in range(10):
self.simulate_put(queue_uri)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
def test_list_queues_with_no_queues_204s(self):
self.simulate_get('/v1/queues')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# An incomplete test, only for Bug #1234481
# TODO(zyuan): tearDown the queue creation
@@ -126,7 +126,7 @@ class QueuesTest(base.TestBase):
self._mock_create_queue('/v1/queues/q2', status=201)
result = self.simulate_get('/v1/queues', query_string="?detailed=True")
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
doc = json.loads(result[0])
for entry in doc['queues']:
@@ -154,9 +154,9 @@ class QueuesWithNoPartitionsTest(base.TestBase):
def test_put_raises_500_with_no_partitions_registered(self):
self.simulate_put('/v1/queues/no')
self.assertEquals(self.srmock.status, falcon.HTTP_500)
self.assertEqual(self.srmock.status, falcon.HTTP_500)
@ddt.data('get', 'head', 'delete')
def test_404_with_no_partitions_registered(self, method):
getattr(self, 'simulate_' + method)('/v1/queues/no')
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)

40
tests/unit/queues/storage/test_impl_mongodb.py
View File

@@ -34,28 +34,28 @@ from marconi.tests.queues.storage import base
class MongodbUtilsTest(testing.TestBase):
def test_scope_queue_name(self):
self.assertEquals(utils.scope_queue_name('my-q'), '/my-q')
self.assertEquals(utils.scope_queue_name('my-q', None), '/my-q')
self.assertEquals(utils.scope_queue_name('my-q', '123'), '123/my-q')
self.assertEqual(utils.scope_queue_name('my-q'), '/my-q')
self.assertEqual(utils.scope_queue_name('my-q', None), '/my-q')
self.assertEqual(utils.scope_queue_name('my-q', '123'), '123/my-q')
self.assertEquals(utils.scope_queue_name(None), '/')
self.assertEquals(utils.scope_queue_name(None, '123'), '123/')
self.assertEqual(utils.scope_queue_name(None), '/')
self.assertEqual(utils.scope_queue_name(None, '123'), '123/')
def test_descope_queue_name(self):
self.assertEquals(utils.descope_queue_name('/'), None)
self.assertEquals(utils.descope_queue_name('/some-pig'), 'some-pig')
self.assertEquals(utils.descope_queue_name('radiant/some-pig'),
'some-pig')
self.assertEqual(utils.descope_queue_name('/'), None)
self.assertEqual(utils.descope_queue_name('/some-pig'), 'some-pig')
self.assertEqual(utils.descope_queue_name('radiant/some-pig'),
'some-pig')
def test_calculate_backoff(self):
sec = utils.calculate_backoff(0, 10, 2, 0)
self.assertEquals(sec, 0)
self.assertEqual(sec, 0)
sec = utils.calculate_backoff(9, 10, 2, 0)
self.assertEquals(sec, 1.8)
self.assertEqual(sec, 1.8)
sec = utils.calculate_backoff(4, 10, 2, 0)
self.assertEquals(sec, 0.8)
self.assertEqual(sec, 0.8)
sec = utils.calculate_backoff(4, 10, 2, 1)
if sec != 0.8:
@@ -188,13 +188,13 @@ class MongodbMessageTests(base.MessageControllerTest):
new_value = self.queue_controller._inc_counter(queue_name)
self.assertIsNotNone(new_value)
value_after = self.queue_controller._get_counter(queue_name)
self.assertEquals(value_after, value_before + 1)
self.assertEqual(value_after, value_before + 1)
value_before = value_after
new_value = self.queue_controller._inc_counter(queue_name, amount=7)
value_after = self.queue_controller._get_counter(queue_name)
self.assertEquals(value_after, value_before + 7)
self.assertEquals(value_after, new_value)
self.assertEqual(value_after, value_before + 7)
self.assertEqual(value_after, new_value)
reference_value = value_after
@@ -208,7 +208,7 @@ class MongodbMessageTests(base.MessageControllerTest):
timeutils.advance_time_seconds(10)
changed = self.queue_controller._inc_counter(queue_name, window=5)
self.assertEquals(changed, reference_value + 1)
self.assertEqual(changed, reference_value + 1)
timeutils.clear_time_override()
def test_race_condition_on_post(self):
@@ -252,7 +252,7 @@ class MongodbMessageTests(base.MessageControllerTest):
method.return_value = 2
messages = expected_messages[:1]
created = list(self.controller.post(queue_name, messages, uuid))
self.assertEquals(len(created), 1)
self.assertEqual(len(created), 1)
# Force infinite retries
if testing.RUN_SLOW_TESTS:
@@ -265,7 +265,7 @@ class MongodbMessageTests(base.MessageControllerTest):
expected_messages[1:],
uuid))
self.assertEquals(len(created), 2)
self.assertEqual(len(created), 2)
expected_ids = [m['body']['backupId'] for m in expected_messages]
@@ -273,10 +273,10 @@ class MongodbMessageTests(base.MessageControllerTest):
echo=True)
actual_messages = list(next(interaction))
self.assertEquals(len(actual_messages), len(expected_messages))
self.assertEqual(len(actual_messages), len(expected_messages))
actual_ids = [m['body']['backupId'] for m in actual_messages]
self.assertEquals(actual_ids, expected_ids)
self.assertEqual(actual_ids, expected_ids)
def test_empty_queue_exception(self):
queue_name = 'empty-queue-test'

2
tests/unit/queues/transport/wsgi/test_auth.py
View File

@@ -41,4 +41,4 @@ class TestWSGIAuth(base.TestBase):
headers=self.headers)
self.app(env, self.srmock)
self.assertEquals(self.srmock.status, falcon.HTTP_401)
self.assertEqual(self.srmock.status, falcon.HTTP_401)

76
tests/unit/queues/transport/wsgi/test_claims.py
View File

@@ -42,12 +42,12 @@ class ClaimsBaseTest(base.TestBase):
doc = '{"_ttl": 60}'
self.simulate_put(self.queue_path, self.project_id, body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
doc = json.dumps([{'body': 239, 'ttl': 300}] * 10)
self.simulate_post(self.queue_path + '/messages', self.project_id,
body=doc, headers={'Client-ID': str(uuid.uuid4())})
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
def tearDown(self):
self.simulate_delete(self.queue_path, self.project_id)
@@ -57,26 +57,26 @@ class ClaimsBaseTest(base.TestBase):
@ddt.data(None, '[', '[]', '{}', '.', '"fail"')
def test_bad_claim(self, doc):
self.simulate_post(self.claims_path, self.project_id, body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
href = self._get_a_claim()
self.simulate_patch(href, self.project_id, body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_exceeded_claim(self):
self.simulate_post(self.claims_path, self.project_id,
body='{"ttl": 100, "grace": 60}',
query_string='limit=21')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
@ddt.data((-1, -1), (59, 60), (60, 59), (60, 43201), (43201, 60))
def test_unacceptable_ttl_or_grace(self, (ttl, grace)):
self.simulate_post(self.claims_path, self.project_id,
body=json.dumps({'ttl': ttl, 'grace': grace}))
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
@ddt.data(-1, 59, 43201)
def test_unacceptable_new_ttl(self, ttl):
@@ -85,7 +85,7 @@ class ClaimsBaseTest(base.TestBase):
self.simulate_patch(href, self.project_id,
body=json.dumps({'ttl': ttl}))
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def _get_a_claim(self):
doc = '{"ttl": 100, "grace": 60}'
@@ -98,20 +98,20 @@ class ClaimsBaseTest(base.TestBase):
(self.wsgi_cfg.metadata_max_length - len(doc) + 1))
self.simulate_post(self.claims_path, self.project_id, body=long_doc)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_post(self.claims_path, self.project_id, body=doc)
href = self.srmock.headers_dict['Location']
self.simulate_patch(href, self.project_id, body=long_doc)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_lifecycle(self):
doc = '{"ttl": 100, "grace": 60}'
# First, claim some messages
body = self.simulate_post(self.claims_path, self.project_id, body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
claimed = json.loads(body[0])
claim_href = self.srmock.headers_dict['Location']
@@ -120,7 +120,7 @@ class ClaimsBaseTest(base.TestBase):
# No more messages to claim
self.simulate_post(self.claims_path, self.project_id, body=doc,
query_string='limit=3')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
headers = {
'Client-ID': str(uuid.uuid4()),
@@ -129,15 +129,15 @@ class ClaimsBaseTest(base.TestBase):
# Listing messages, by default, won't include claimed
body = self.simulate_get(self.messages_path, self.project_id,
headers=headers)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Include claimed messages this time
body = self.simulate_get(self.messages_path, self.project_id,
query_string='include_claimed=true',
headers=headers)
listed = json.loads(body[0])
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEquals(len(listed['messages']), len(claimed))
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.assertEqual(len(listed['messages']), len(claimed))
# Check the claim's metadata
## NOTE(cpp-cabrera): advance time to force claim aging
@@ -147,35 +147,35 @@ class ClaimsBaseTest(base.TestBase):
timeutils.clear_time_override()
claim = json.loads(body[0])
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEquals(self.srmock.headers_dict['Content-Location'],
claim_href)
self.assertEquals(claim['ttl'], 100)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.headers_dict['Content-Location'],
claim_href)
self.assertEqual(claim['ttl'], 100)
## NOTE(cpp-cabrera): verify that claim age is non-negative
self.assertThat(claim['age'], matchers.GreaterThan(-1))
# Try to delete the message without submitting a claim_id
self.simulate_delete(message_href, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_403)
self.assertEqual(self.srmock.status, falcon.HTTP_403)
# Delete the message and its associated claim
self.simulate_delete(message_href, self.project_id,
query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Try to get it from the wrong project
self.simulate_get(message_href, 'bogus_project', query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Get the message
self.simulate_get(message_href, self.project_id, query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Update the claim
new_claim_ttl = '{"ttl": 60}'
creation = timeutils.utcnow()
self.simulate_patch(claim_href, self.project_id, body=new_claim_ttl)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Get the claimed messages (again)
body = self.simulate_get(claim_href, self.project_id)
@@ -183,52 +183,52 @@ class ClaimsBaseTest(base.TestBase):
claim = json.loads(body[0])
message_href, params = claim['messages'][0]['href'].split('?')
self.assertEquals(claim['ttl'], 60)
self.assertEqual(claim['ttl'], 60)
estimated_age = timeutils.delta_seconds(creation, query)
self.assertTrue(estimated_age > claim['age'])
# Delete the claim
self.simulate_delete(claim['href'], 'bad_id')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
self.simulate_delete(claim['href'], self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Try to delete a message with an invalid claim ID
self.simulate_delete(message_href, self.project_id,
query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_403)
self.assertEqual(self.srmock.status, falcon.HTTP_403)
# Make sure it wasn't deleted!
self.simulate_get(message_href, self.project_id, query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
# Try to get a claim that doesn't exist
self.simulate_get(claim['href'])
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Try to update a claim that doesn't exist
self.simulate_patch(claim['href'], body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
def test_nonexistent(self):
self.simulate_post('/v1/queues/nonexistent/claims', self.project_id,
body='{"ttl": 100, "grace": 60}')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# NOTE(cpp-cabrera): regression test against bug #1203842
def test_get_nonexistent_claim_404s(self):
self.simulate_get(self.claims_path + '/a')
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
def test_delete_nonexistent_claim_204s(self):
self.simulate_delete(self.claims_path + '/a')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
def test_patch_nonexistent_claim_404s(self):
patch_data = json.dumps({'ttl': 100})
self.simulate_patch(self.claims_path + '/a', body=patch_data)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
@testing.requires_mongodb
@@ -268,13 +268,13 @@ class ClaimsFaultyDriverTests(base.TestBaseFaulty):
doc = '{"ttl": 100, "grace": 60}'
self.simulate_post(claims_path, project_id, body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.simulate_get(claims_path + '/nichts', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.simulate_patch(claims_path + '/nichts', project_id, body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.simulate_delete(claims_path + '/foo', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)

8
tests/unit/queues/transport/wsgi/test_health.py
View File

@@ -25,10 +25,10 @@ class TestHealth(base.TestBase):
def test_get(self):
response = self.simulate_get('/v1/health')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEquals(response, [])
self.assertEqual(self.srmock.status, falcon.HTTP_204)
self.assertEqual(response, [])
def test_head(self):
response = self.simulate_head('/v1/health')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEquals(response, [])
self.assertEqual(self.srmock.status, falcon.HTTP_204)
self.assertEqual(response, [])

4
tests/unit/queues/transport/wsgi/test_home.py
View File

@@ -27,10 +27,10 @@ class TestHomeDocument(base.TestBase):
def test_json_response(self):
body = self.simulate_get('/v1')
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
content_type = self.srmock.headers_dict['Content-Type']
self.assertEquals(content_type, 'application/json-home')
self.assertEqual(content_type, 'application/json-home')
try:
json.loads(body[0])

2
tests/unit/queues/transport/wsgi/test_media_type.py
View File

@@ -48,4 +48,4 @@ class TestWSGIMediaType(base.TestBase):
headers=headers)
self.app(env, self.srmock)
self.assertEquals(self.srmock.status, falcon.HTTP_406)
self.assertEqual(self.srmock.status, falcon.HTTP_406)

118
tests/unit/queues/transport/wsgi/test_messages.py
View File

@@ -56,19 +56,19 @@ class MessagesBaseTest(base.TestBase):
result = self.simulate_post(self.messages_path, self.project_id,
body=sample_doc, headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
result_doc = json.loads(result[0])
msg_ids = self._get_msg_ids(self.srmock.headers_dict)
self.assertEquals(len(msg_ids), len(sample_messages))
self.assertEqual(len(msg_ids), len(sample_messages))
expected_resources = [unicode(self.messages_path + '/' + id)
for id in msg_ids]
self.assertEquals(expected_resources, result_doc['resources'])
self.assertEqual(expected_resources, result_doc['resources'])
self.assertFalse(result_doc['partial'])
self.assertEquals(len(msg_ids), len(sample_messages))
self.assertEqual(len(msg_ids), len(sample_messages))
lookup = dict([(m['ttl'], m['body']) for m in sample_messages])
@@ -81,18 +81,18 @@ class MessagesBaseTest(base.TestBase):
# Wrong project ID
self.simulate_get(message_uri, '777777')
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Correct project ID
result = self.simulate_get(message_uri, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEquals(self.srmock.headers_dict['Content-Location'],
message_uri)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.headers_dict['Content-Location'],
message_uri)
# Check message properties
message = json.loads(result[0])
self.assertEquals(message['href'], message_uri)
self.assertEquals(message['body'], lookup[message['ttl']])
self.assertEqual(message['href'], message_uri)
self.assertEqual(message['body'], lookup[message['ttl']])
# no negative age
# NOTE(cpp-cabrera): testtools lacks GreaterThanEqual on py26
@@ -105,7 +105,7 @@ class MessagesBaseTest(base.TestBase):
result = self.simulate_get(self.messages_path, self.project_id,
query_string=query_string)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
result_doc = json.loads(result[0])
expected_ttls = set(m['ttl'] for m in sample_messages)
actual_ttls = set(m['ttl'] for m in result_doc)
@@ -118,28 +118,28 @@ class MessagesBaseTest(base.TestBase):
# Posting restriction
self._post_messages(self.messages_path, repeat=23)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
# Bulk GET restriction
query_string = 'ids=' + ','.join([msg_id] * 21)
self.simulate_get(self.messages_path, self.project_id,
query_string=query_string)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
# Listing restriction
self.simulate_get(self.messages_path, self.project_id,
query_string='limit=21',
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
# Bulk deletion restriction
query_string = 'ids=' + ','.join([msg_id] * 22)
self.simulate_delete(self.messages_path, self.project_id,
query_string=query_string)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_post_single(self):
sample_messages = [
@@ -168,7 +168,7 @@ class MessagesBaseTest(base.TestBase):
path = path.encode('utf-8')
self._post_messages(path)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_post_with_long_queue_name(self):
# NOTE(kgriffs): This test verifies that routes with
@@ -177,15 +177,15 @@ class MessagesBaseTest(base.TestBase):
game_title = 'v' * validation.QUEUE_NAME_MAX_LEN
self._post_messages('/v1/queues/' + game_title + '/messages')
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
game_title += 'v'
self._post_messages('/v1/queues/' + game_title + '/messages')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_post_to_missing_queue(self):
self._post_messages('/v1/queues/nonexistent/messages')
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
@ddt.data('', '0xdeadbeef', '550893e0-2b6e-11e3-835a-5cf9dd72369')
def test_bad_client_id(self, text_id):
@@ -193,13 +193,13 @@ class MessagesBaseTest(base.TestBase):
body='{"ttl": 60, "body": ""}',
headers={'Client-ID': text_id})
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_get(self.queue_path + '/messages',
query_string='limit=3&echo=true',
headers={'Client-ID': text_id})
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
@ddt.data(None, '[', '[]', '{}', '.')
def test_post_bad_message(self, document):
@@ -207,7 +207,7 @@ class MessagesBaseTest(base.TestBase):
body=document,
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
@ddt.data(-1, 59, 1209601)
def test_unacceptable_ttl(self, ttl):
@@ -216,7 +216,7 @@ class MessagesBaseTest(base.TestBase):
'body': None}]),
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_exceeded_message_posting(self):
# Total (raw request) size
@@ -228,7 +228,7 @@ class MessagesBaseTest(base.TestBase):
body=long_doc,
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
@ddt.data('{"overflow": 9223372036854775808}',
'{"underflow": -9223372036854775809}')
@@ -237,7 +237,7 @@ class MessagesBaseTest(base.TestBase):
body=document,
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_delete(self):
self._post_messages(self.messages_path)
@@ -245,17 +245,17 @@ class MessagesBaseTest(base.TestBase):
target = self.messages_path + '/' + msg_id
self.simulate_get(target, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.simulate_delete(target, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
self.simulate_get(target, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Safe to delete non-existing ones
self.simulate_delete(target, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
def test_bulk_delete(self):
path = self.queue_path + '/messages'
@@ -264,24 +264,24 @@ class MessagesBaseTest(base.TestBase):
# Deleting the whole collection is denied
self.simulate_delete(path, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_delete(target, self.project_id, query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
self.simulate_get(target, self.project_id, query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Safe to delete non-existing ones
self.simulate_delete(target, self.project_id, query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Even after the queue is gone
self.simulate_delete(self.queue_path, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
self.simulate_delete(target, self.project_id, query_string=params)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
def test_list(self):
path = self.queue_path + '/messages'
@@ -292,9 +292,9 @@ class MessagesBaseTest(base.TestBase):
query_string=query_string,
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEquals(self.srmock.headers_dict['Content-Location'],
path + '?' + query_string)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.headers_dict['Content-Location'],
path + '?' + query_string)
cnt = 0
while self.srmock.status == falcon.HTTP_200:
@@ -303,23 +303,23 @@ class MessagesBaseTest(base.TestBase):
for msg in contents['messages']:
self.simulate_get(msg['href'], self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
body = self.simulate_get(target, self.project_id,
query_string=params,
headers=self.headers)
cnt += 1
self.assertEquals(cnt, 4)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(cnt, 4)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Stats
body = self.simulate_get(self.queue_path + '/stats', self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
message_stats = json.loads(body[0])['messages']
self.assertEquals(self.srmock.headers_dict['Content-Location'],
self.queue_path + '/stats')
self.assertEqual(self.srmock.headers_dict['Content-Location'],
self.queue_path + '/stats')
# NOTE(kgriffs): The other parts of the stats are tested
# in tests.storage.base and so are not repeated here.
@@ -331,7 +331,7 @@ class MessagesBaseTest(base.TestBase):
# NOTE(kgriffs): Try to get messages for a missing queue
self.simulate_get('/v1/queues/nonexistent/messages', self.project_id,
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
def test_list_with_bad_marker(self):
path = self.queue_path + '/messages'
@@ -349,10 +349,10 @@ class MessagesBaseTest(base.TestBase):
self.simulate_post(path, '7e7e7e', body='[{"body": 0, "ttl": 100}]')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_get(path, '7e7e7e')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
# NOTE(cpp-cabrera): regression test against bug #1210633
def test_when_claim_deleted_then_messages_unclaimed(self):
@@ -362,37 +362,37 @@ class MessagesBaseTest(base.TestBase):
# post claim
self.simulate_post(path + '/claims', self.project_id,
body='{"ttl": 100, "grace": 100}')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
location = self.srmock.headers_dict['Location']
# release claim
self.simulate_delete(location, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# get unclaimed messages
self.simulate_get(path + '/messages', self.project_id,
query_string='echo=true',
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
# NOTE(cpp-cabrera): regression test against bug #1203842
def test_get_nonexistent_message_404s(self):
path = '/v1/queues/notthere'
self.simulate_get(path + '/messages/a')
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
def test_get_multiple_invalid_messages_204s(self):
path = '/v1/queues/notthere'
self.simulate_get(path + '/messages', query_string='ids=a,b,c')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
def test_delete_multiple_invalid_messages_204s(self):
path = '/v1/queues/notthere'
self.simulate_delete(path + '/messages', query_string='ids=a,b,c')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
def test_delete_message_with_invalid_claim_doesnt_delete_message(self):
path = self.queue_path
@@ -400,10 +400,10 @@ class MessagesBaseTest(base.TestBase):
location = json.loads(resp[0])['resources'][0]
self.simulate_delete(location, query_string='claim_id=invalid')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
self.simulate_get(location, self.project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
def _post_messages(self, target, repeat=1):
doc = json.dumps([{'body': 239, 'ttl': 300}] * repeat)
@@ -446,14 +446,14 @@ class MessagesFaultyDriverTests(base.TestBaseFaulty):
self.simulate_post(path, project_id,
body=doc,
headers=headers)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.simulate_get(path, project_id,
headers=headers)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.simulate_get(path + '/nonexistent', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.simulate_delete(path + '/nada', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)

92
tests/unit/queues/transport/wsgi/test_queue_lifecycle.py
View File

@@ -39,16 +39,16 @@ class QueueLifecycleBaseTest(base.TestBase):
path = '/v1/queues/gumshoe'
self.simulate_get(path, '')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_put(path, '')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_head(path, '')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_delete(path, '')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
@ddt.data('480924', 'foo', None)
def test_basics_thoroughly(self, project_id):
@@ -56,63 +56,63 @@ class QueueLifecycleBaseTest(base.TestBase):
# Stats not found - queue not created yet
self.simulate_get(path + '/stats', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Metadata not found - queue not created yet
self.simulate_get(path + '/metadata', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Create
self.simulate_put(path, project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
location = ('Location', '/v1/queues/gumshoe')
self.assertIn(location, self.srmock.headers)
# Ensure queue existence
self.simulate_head(path, project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Add metadata
doc = '{"messages": {"ttl": 600}}'
self.simulate_put(path + '/metadata', project_id, body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Fetch metadata
result = self.simulate_get(path + '/metadata', project_id)
result_doc = json.loads(result[0])
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEquals(result_doc, json.loads(doc))
self.assertEqual(self.srmock.status, falcon.HTTP_200)
self.assertEqual(result_doc, json.loads(doc))
# Stats empty queue
self.simulate_get(path + '/stats', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
# Delete
self.simulate_delete(path, project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Get non-existent queue
self.simulate_get(path, project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Get non-existent stats
self.simulate_get(path + '/stats', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
# Get non-existent metadata
self.simulate_get(path + '/metadata', project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_404)
self.assertEqual(self.srmock.status, falcon.HTTP_404)
def test_name_restrictions(self):
self.simulate_put('/v1/queues/Nice-Boat_2')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
self.simulate_put('/v1/queues/Nice-Bo@t')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_put('/v1/queues/_' + 'niceboat' * 8)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
@ddt.data((u'/v1/queues/non-ascii-n\u0153me', 'utf-8'),
(u'/v1/queues/non-ascii-n\xc4me', 'iso8859-1'))
@@ -122,94 +122,94 @@ class QueueLifecycleBaseTest(base.TestBase):
uri = uri.encode(enc)
self.simulate_put(uri)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_get(uri)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_delete(uri)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_no_metadata(self):
self.simulate_put('/v1/queues/fizbat')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
self.simulate_put('/v1/queues/fizbat/metadata')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
self.simulate_put('/v1/queues/fizbat/metadata', body='')
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
@ddt.data('{', '[]', '.', ' ', '')
def test_bad_metadata(self, document):
self.simulate_put('/v1/queues/fizbat', '7e55e1a7e')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
self.simulate_put('/v1/queues/fizbat/metadata', '7e55e1a7e',
body=document)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_too_much_metadata(self):
self.simulate_put('/v1/queues/fizbat', '7e55e1a7e')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
doc = '{{"messages": {{"ttl": 600}}, "padding": "{pad}"}}'
padding_len = self.wsgi_cfg.metadata_max_length - (len(doc) - 10) + 1
doc = doc.format(pad='x' * padding_len)
self.simulate_put('/v1/queues/fizbat/metadata', '7e55e1a7e', body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_way_too_much_metadata(self):
self.simulate_put('/v1/queues/fizbat', '7e55e1a7e')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
doc = '{{"messages": {{"ttl": 600}}, "padding": "{pad}"}}'
padding_len = self.wsgi_cfg.metadata_max_length * 100
doc = doc.format(pad='x' * padding_len)
self.simulate_put('/v1/queues/fizbat/metadata', '7e55e1a7e', body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_custom_metadata(self):
self.simulate_put('/v1/queues/fizbat', '480924')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
# Set
doc = '{{"messages": {{"ttl": 600}}, "padding": "{pad}"}}'
padding_len = self.wsgi_cfg.metadata_max_length - (len(doc) - 2)
doc = doc.format(pad='x' * padding_len)
self.simulate_put('/v1/queues/fizbat/metadata', '480924', body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Get
result = self.simulate_get('/v1/queues/fizbat/metadata', '480924')
result_doc = json.loads(result[0])
self.assertEquals(result_doc, json.loads(doc))
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(result_doc, json.loads(doc))
self.assertEqual(self.srmock.status, falcon.HTTP_200)
def test_update_metadata(self):
# Create
path = '/v1/queues/xyz'
project_id = '480924'
self.simulate_put(path, project_id)
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
# Set meta
doc1 = '{"messages": {"ttl": 600}}'
self.simulate_put(path + '/metadata', project_id, body=doc1)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Update
doc2 = '{"messages": {"ttl": 100}}'
self.simulate_put(path + '/metadata', project_id, body=doc2)
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Get
result = self.simulate_get(path + '/metadata', project_id)
result_doc = json.loads(result[0])
self.assertEquals(result_doc, json.loads(doc2))
self.assertEquals(self.srmock.headers_dict['Content-Location'],
path + '/metadata')
self.assertEqual(result_doc, json.loads(doc2))
self.assertEqual(self.srmock.headers_dict['Content-Location'],
path + '/metadata')
def test_list(self):
arbitrary_number = 644079696574693
@@ -343,21 +343,21 @@ class QueueFaultyDriverTests(base.TestBaseFaulty):
path = '/v1/queues/gumshoe'
doc = '{"messages": {"ttl": 600}}'
self.simulate_put(path, '480924', body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
location = ('Location', path)
self.assertNotIn(location, self.srmock.headers)
result = self.simulate_get(path + '/metadata', '480924')
result_doc = json.loads(result[0])
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.assertNotEquals(result_doc, json.loads(doc))
self.simulate_get(path + '/stats', '480924')
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.simulate_get('/v1/queues', '480924')
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)
self.simulate_delete(path, '480924')
self.assertEquals(self.srmock.status, falcon.HTTP_503)
self.assertEqual(self.srmock.status, falcon.HTTP_503)

6
tests/unit/queues/transport/wsgi/test_utils.py
View File

@@ -59,13 +59,13 @@ class TestWSGIutils(testtools.TestCase):
doc = {'hello': 'world', 'teh answer': 42, 'question': []}
value = utils.get_checked_field(doc, 'hello', str)
self.assertEquals(value, 'world')
self.assertEqual(value, 'world')
value = utils.get_checked_field(doc, 'teh answer', int)
self.assertEquals(value, 42)
self.assertEqual(value, 42)
value = utils.get_checked_field(doc, 'question', list)
self.assertEquals(value, [])
self.assertEqual(value, [])
def test_filter_missing(self):
doc = {'body': {'event': 'start_backup'}}

8
tests/unit/queues/transport/wsgi/test_validation.py
View File

@@ -47,7 +47,7 @@ class ValidationTest(base.TestBase):
self.project_id,
body='{"timespace": "Shangri-la"}')
self.assertEquals(self.srmock.status, falcon.HTTP_204)
self.assertEqual(self.srmock.status, falcon.HTTP_204)
# Too long
metadata_size_uplimit = 64
@@ -63,7 +63,7 @@ class ValidationTest(base.TestBase):
self.project_id,
body=doc)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)
def test_message_deserialization(self):
# Normal case
@@ -72,7 +72,7 @@ class ValidationTest(base.TestBase):
body='[{"body": "Dragon Knights", "ttl": 100}]',
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
# Both messages' size are too long
message_size_uplimit = 256
@@ -88,4 +88,4 @@ class ValidationTest(base.TestBase):
body=doc,
headers=self.headers)
self.assertEquals(self.srmock.status, falcon.HTTP_400)
self.assertEqual(self.srmock.status, falcon.HTTP_400)

14
tests/unit/transport/wsgi/test_default_limits.py
View File

@@ -43,13 +43,13 @@ class DefaultLimitsTest(base.TestBase):
# 2 queues to list
self.simulate_put('/v1/queues/q2')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
result = self.simulate_get('/v1/queues')
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
queues = json.loads(result[0])['queues']
self.assertEquals(len(queues), default_queue_paging)
self.assertEqual(len(queues), default_queue_paging)
self.simulate_delete('/v1/queues/q2')
@@ -62,10 +62,10 @@ class DefaultLimitsTest(base.TestBase):
result = self.simulate_get(self.messages_path,
headers={'Client-ID': str(uuid.uuid4())})
self.assertEquals(self.srmock.status, falcon.HTTP_200)
self.assertEqual(self.srmock.status, falcon.HTTP_200)
messages = json.loads(result[0])['messages']
self.assertEquals(len(messages), default_message_paging)
self.assertEqual(len(messages), default_message_paging)
def test_claim_creation(self):
default_message_paging = 2
@@ -76,10 +76,10 @@ class DefaultLimitsTest(base.TestBase):
result = self.simulate_post(self.claims_path,
body='{"ttl": 60, "grace": 60}')
self.assertEquals(self.srmock.status, falcon.HTTP_201)
self.assertEqual(self.srmock.status, falcon.HTTP_201)
messages = json.loads(result[0])
self.assertEquals(len(messages), default_message_paging)
self.assertEqual(len(messages), default_message_paging)
def __prepare_messages(self, count):
doc = json.dumps([{'body': 239, 'ttl': 300}] * count)