Corrected spelling of received

Change-Id: I5b40eda77f72b84a0787d0913b5f8e83ba3702ea
This commit is contained in:
Dougal Matthews 2016-05-18 19:32:48 +01:00
parent 80470caf01
commit 35f4f4e74f
12 changed files with 299 additions and 299 deletions

View File

@ -83,13 +83,13 @@ class DelimiterTest(ObjectStorageFixture):
continue
expected = len(obj_names)
recieved = len(parsed_content)
received = len(parsed_content)
self.assertEqual(
expected,
recieved,
msg="expected {0} objects in the response body, recieved"
" {1}".format(expected, recieved))
received,
msg="expected {0} objects in the response body, received"
" {1}".format(expected, received))
for obj_name in obj_names:
tokens = obj_name.split('/')

View File

@ -69,14 +69,14 @@ class ListLimitTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 2
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertIn("a_obj", members, msg="a_obj was not in the response")
self.assertIn("b_obj", members, msg="b_obj was not in the response")
@ -96,11 +96,11 @@ class ListLimitTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 0
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))

View File

@ -71,14 +71,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 5
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertIn("c_obj", members, msg="c_obj was not in the response")
self.assertIn("d_obj", members, msg="d_obj was not in the response")
self.assertIn("e_obj", members, msg="e_obj was not in the response")
@ -106,18 +106,18 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = len(self.obj_names)
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertEqual(
members,
self.obj_names,
msg="expected {0} recieved {1}".format(members, self.obj_names))
msg="expected {0} received {1}".format(members, self.obj_names))
def test_marker_swapped_lower_bound(self):
params = {"marker": "h", "format": "json"}
@ -133,14 +133,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 0
recieved = len(content)
received = len(content)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
def test_end_marker(self):
params = {"end_marker": "d", "format": "json", "format": "json"}
@ -163,14 +163,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 2
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertIn("b_obj", members, msg="b_obj was not in the response")
self.assertIn("c_obj", members, msg="c_obj was not in the response")
@ -195,18 +195,18 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = len(self.obj_names)
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertEqual(
members,
self.obj_names,
msg="expected {0} recieved {1}".format(members, self.obj_names))
msg="expected {0} received {1}".format(members, self.obj_names))
def test_end_marker_swapped_uppper_bound(self):
params = {"end_marker": "a", "format": "json", "format": "json"}
@ -222,14 +222,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 0
recieved = len(content)
received = len(content)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
def test_marker_end_marker(self):
params = {"marker": "b", "end_marker": "e", "format": "json"}
@ -252,14 +252,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 3
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertIn("b_obj", members, msg="b_obj was not in the response")
self.assertIn("c_obj", members, msg="c_obj was not in the response")
self.assertIn('d_obj', members, msg="d_obj was not in the response")
@ -285,18 +285,18 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = len(self.obj_names)
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertEqual(
members,
self.obj_names,
msg="expected {0} recieved {1}".format(members, self.obj_names))
msg="expected {0} received {1}".format(members, self.obj_names))
def test_marker_end_marker_swapped_upper_lower_bound(self):
params = {"marker": "h", "end_marker": "a", "format": "json"}
@ -312,14 +312,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 0
recieved = len(content)
received = len(content)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
def test_marker_limit(self):
params = {"marker": "b", "limit": "2", "format": "json"}
@ -342,14 +342,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 2
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertIn("b_obj", members, msg="b_obj was not in the response")
self.assertIn("c_obj", members, msg="c_obj was not in the response")
@ -374,18 +374,18 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = len(self.obj_names)
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertEqual(
members,
self.obj_names,
msg="expected {0} recieved {1}".format(members, self.obj_names))
msg="expected {0} received {1}".format(members, self.obj_names))
def test_marker_limit_swapped_lower_bound(self):
params = {"marker": "h", "limit": "6", "format": "json"}
@ -401,14 +401,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 0
recieved = len(content)
received = len(content)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
def test_end_marker_limit(self):
params = {"end_marker": "e", "limit": "2", "format": "json"}
@ -431,14 +431,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 2
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertIn("b_obj", members, msg="b_obj was not in the response")
self.assertIn("c_obj", members, msg="c_obj was not in the response")
@ -463,18 +463,18 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = len(self.obj_names)
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertEqual(
members,
self.obj_names,
msg="expected {0} recieved {1}".format(members, self.obj_names))
msg="expected {0} received {1}".format(members, self.obj_names))
def test_end_marker_limit_swapped_upper_bound(self):
params = {"end_marker": "a", "limit": "6", "format": "json"}
@ -490,14 +490,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 0
recieved = len(content)
received = len(content)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
def test_marker_end_marker_limit(self):
params = {"marker": "b",
@ -523,14 +523,14 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 2
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertIn("b_obj", members, msg="b_obj was not in the response")
self.assertIn("c_obj", members, msg="c_obj was not in the response")
@ -558,18 +558,18 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = len(self.obj_names)
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertEqual(
members,
self.obj_names,
msg="expected {0} recieved {1}".format(members, self.obj_names))
msg="expected {0} received {1}".format(members, self.obj_names))
def test_marker_end_marker_limit_swapped_upper_lower_bound(self):
params = {"marker": "h",
@ -588,11 +588,11 @@ class MarkerEndMarkerTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 0
recieved = len(content)
received = len(content)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))

View File

@ -96,14 +96,14 @@ class PrefixTest(ObjectStorageFixture):
self.assertTrue(response.ok)
expected = 4
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
msg="expected {0} members in the response, recieved {1}".format(
received,
msg="expected {0} members in the response, received {1}".format(
expected,
recieved))
received))
self.assertIn(
"music_play_list",
members,

View File

@ -106,7 +106,7 @@ class ObjectUpdaterTest(ObjectStorageFixture):
num_created_containers,
updated_get_count,
msg="GET x-container-object-count expected: {0}"
" x-container-object-count recieved: {1}".format(
" x-container-object-count received: {1}".format(
num_created_containers,
updated_get_count))
@ -114,7 +114,7 @@ class ObjectUpdaterTest(ObjectStorageFixture):
updated_head_count,
num_created_containers,
msg="HEAD x-container-object-count expected: {0}"
" x-container-object-count recieved: {1}".format(
" x-container-object-count received: {1}".format(
num_created_containers,
updated_head_count))
@ -138,7 +138,7 @@ class ObjectUpdaterTest(ObjectStorageFixture):
expected_get_count,
updated_get_count,
msg="GET x-container-object-count expected: {0}"
" x-container-object-count recieved: {1}".format(
" x-container-object-count received: {1}".format(
expected_get_count,
updated_get_count))
@ -146,6 +146,6 @@ class ObjectUpdaterTest(ObjectStorageFixture):
expected_head_count,
updated_head_count,
msg="HEAD x-container-object-count expected: {0}"
" x-container-object-count recieved: {1}".format(
" x-container-object-count received: {1}".format(
expected_head_count,
updated_head_count))

View File

@ -170,7 +170,7 @@ class TempUrlTest(ObjectStorageFixture):
expected_disposition = EXPECTED_DISPOSITION.format(
filename=self.object_name)
recieved_disposition = response.headers.get('content-disposition')
received_disposition = response.headers.get('content-disposition')
self.assertIn(
'content-disposition',
@ -178,10 +178,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
response.content,
self.object_data,
@ -234,7 +234,7 @@ class TempUrlTest(ObjectStorageFixture):
self.assertTrue(response.ok, 'object should be retrieved over tempurl')
expected_disposition = attachment_hdr
recieved_disposition = response.headers.get('content-disposition')
received_disposition = response.headers.get('content-disposition')
self.assertIn(
'content-disposition',
@ -242,10 +242,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
response.content,
self.object_data,
@ -307,7 +307,7 @@ class TempUrlTest(ObjectStorageFixture):
expected_disposition = EXPECTED_DISPOSITION.format(
filename=expected_filename)
recieved_disposition = tempurl_get_response.headers.get(
received_disposition = tempurl_get_response.headers.get(
'content-disposition')
self.assertIn(
@ -316,10 +316,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
tempurl_get_response.content,
self.object_data,
@ -394,7 +394,7 @@ class TempUrlTest(ObjectStorageFixture):
msg='expires was not in the created tempurl')
expected_disposition = content_disposition
recieved_disposition = tempurl_get_response.headers.get(
received_disposition = tempurl_get_response.headers.get(
'content-disposition')
self.assertIn(
@ -403,10 +403,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
tempurl_get_response.content,
self.object_data,
@ -482,7 +482,7 @@ class TempUrlTest(ObjectStorageFixture):
expected_disposition = EXPECTED_DISPOSITION.format(
filename=expected_filename)
recieved_disposition = tempurl_get_response.headers.get(
received_disposition = tempurl_get_response.headers.get(
'content-disposition')
self.assertIn(
@ -491,10 +491,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
tempurl_get_response.content,
self.object_data,
@ -569,7 +569,7 @@ class TempUrlTest(ObjectStorageFixture):
msg='expires was not in the created tempurl')
expected_disposition = content_disposition
recieved_disposition = tempurl_get_response.headers.get(
received_disposition = tempurl_get_response.headers.get(
'content-disposition')
self.assertIn(
@ -578,10 +578,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
tempurl_get_response.content,
self.object_data,
@ -638,7 +638,7 @@ class TempUrlTest(ObjectStorageFixture):
expected_disposition = EXPECTED_DISPOSITION.format(
filename=object_name_override)
recieved_disposition = response.headers.get('content-disposition')
received_disposition = response.headers.get('content-disposition')
self.assertIn(
'content-disposition',
@ -646,10 +646,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
response.content,
self.object_data,
@ -708,7 +708,7 @@ class TempUrlTest(ObjectStorageFixture):
expected_disposition = EXPECTED_DISPOSITION.format(
filename=object_name_override)
recieved_disposition = response.headers.get('content-disposition')
received_disposition = response.headers.get('content-disposition')
self.assertIn(
'content-disposition',
@ -716,10 +716,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
response.content,
self.object_data,
@ -778,7 +778,7 @@ class TempUrlTest(ObjectStorageFixture):
expected_disposition = EXPECTED_DISPOSITION.format(
filename=object_name_override)
recieved_disposition = response.headers.get('content-disposition')
received_disposition = response.headers.get('content-disposition')
self.assertIn(
'content-disposition',
@ -786,10 +786,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
response.content,
self.object_data,
@ -973,13 +973,13 @@ class TempUrlTest(ObjectStorageFixture):
expected_disposition = 'attachment; filename="{0}"'.format(
self.object_name)
recieved_disposition = response.headers.get('content-disposition')
received_disposition = response.headers.get('content-disposition')
self.assertTrue(response.ok, 'object should be retrieved over tempurl')
expected_disposition = EXPECTED_DISPOSITION.format(
filename=self.object_name)
recieved_disposition = response.headers.get('content-disposition')
received_disposition = response.headers.get('content-disposition')
self.assertIn(
'content-disposition',
@ -987,10 +987,10 @@ class TempUrlTest(ObjectStorageFixture):
msg='content-disposition was not found in response headers')
self.assertEqual(
expected_disposition,
recieved_disposition,
msg='expected {0} recieved {1}'.format(
received_disposition,
msg='expected {0} received {1}'.format(
expected_disposition,
recieved_disposition))
received_disposition))
self.assertEqual(
response.content,
self.object_data,

View File

@ -22,8 +22,8 @@ from cloudroast.objectstorage.generators import ObjectDatasetList
CONTAINER_NAME = 'object_range_request_test_container'
CONTENT_MSG = 'expected {0} in the content body. recieved {1}'
CONTENT_TYPE_MSG = 'expected content_type {0} recieved {1}'
CONTENT_MSG = 'expected {0} in the content body. received {1}'
CONTENT_TYPE_MSG = 'expected content_type {0} received {1}'
MULTIPART = "multipart/byteranges;boundary="

View File

@ -114,7 +114,7 @@ class ObjectVersioningTest(ObjectStorageFixture):
expected,
received,
msg="retrieving current version of object expected content: {0}"
" recieved content: {1}".format(expected, received))
" received content: {1}".format(expected, received))
"""
check the number of versioned objects
@ -169,7 +169,7 @@ class ObjectVersioningTest(ObjectStorageFixture):
expected,
received,
msg="versioned object prefix expected: {0}"
" recieved: {1}".format(expected, received))
" received: {1}".format(expected, received))
"""
check the content of the versioned object
@ -185,7 +185,7 @@ class ObjectVersioningTest(ObjectStorageFixture):
expected,
received,
msg="retrieving current version of object expected"
" content: {0} recieved content: {1}".format(
" content: {0} received content: {1}".format(
expected,
received))
@ -199,7 +199,7 @@ class ObjectVersioningTest(ObjectStorageFixture):
expected,
received,
msg="versioned object metadata expected"
" X-Object-Meta-Version: {0} recieved"
" X-Object-Meta-Version: {0} received"
" X-Object-Meta-Version: {1}".format(
expected,
received))
@ -262,7 +262,7 @@ class ObjectVersioningTest(ObjectStorageFixture):
expected,
received,
msg="retrieving current version of object expected"
" content: {0} recieved content: {1}".format(
" content: {0} received content: {1}".format(
expected,
received))
@ -277,7 +277,7 @@ class ObjectVersioningTest(ObjectStorageFixture):
expected,
received,
msg="current version object metadata expected"
" content: {0} recieved content: {1}".format(
" content: {0} received content: {1}".format(
expected,
received))

View File

@ -85,16 +85,16 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["subdir", "name"], response.content)
expected = 1
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with prefix: {0} and delimiter: {1}"
" expected: {2} members recieved: {3}".format(
" expected: {2} members received: {3}".format(
prefix,
delimiter,
expected,
recieved))
received))
obj_name = obj_names.get(delimiter)
self.assertIn(
@ -163,16 +163,16 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["subdir", "name"], response.content)
expected = 1
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with prefix: {0} and delimiter: {1}"
" expected: {2} members recieved: {3}".format(
" expected: {2} members received: {3}".format(
prefix,
delimiter,
expected,
recieved))
received))
obj_name = "music/the_best_of_grok_and_drok/"
self.assertIn(
@ -188,16 +188,16 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["subdir", "name"], response.content)
expected = 1
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with prefix: {0} and delimiter: {1}"
" expected: {2} members recieved: {3}".format(
" expected: {2} members received: {3}".format(
prefix,
delimiter,
expected,
recieved))
received))
obj_name = "music/the_best_of_grok_and_drok/grok_live/"
self.assertIn(
@ -213,16 +213,16 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["subdir", "name"], response.content)
expected = 2
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with prefix: {0} and delimiter: {1}"
" expected: {2} members recieved: {3}".format(
" expected: {2} members received: {3}".format(
prefix,
delimiter,
expected,
recieved))
received))
obj_name = "music/the_best_of_grok_and_drok/grok_live/vol_1/"
self.assertIn(
@ -245,16 +245,16 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["subdir", "name"], response.content)
expected = 3
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with prefix: {0} and delimiter: {1}"
" expected: {2} members recieved: {3}".format(
" expected: {2} members received: {3}".format(
prefix,
delimiter,
expected,
recieved))
received))
self.assertIn(
vol1_obj1,
@ -281,16 +281,16 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["subdir", "name"], response.content)
expected = 2
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with prefix: {0} and delimiter: {1}"
" expected: {2} members recieved: {3}".format(
" expected: {2} members received: {3}".format(
prefix,
delimiter,
expected,
recieved))
received))
self.assertIn(
vol2_obj1,
@ -433,12 +433,12 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["name"], response.content)
expected = 3
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with path: {0} expected: {1} members"
" recieved: {2}".format(lvl1_dir_marker, expected, recieved))
" received: {2}".format(lvl1_dir_marker, expected, received))
self.assertIn(
lvl2_dir_marker,
@ -464,12 +464,12 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["name"], response.content)
expected = 3
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with path: {0} expected: {1} members"
" recieved: {2}".format(lvl3_dir_marker, expected, recieved))
" received: {2}".format(lvl3_dir_marker, expected, received))
self.assertIn(
lvl3_dir_marker,
@ -495,12 +495,12 @@ class PsuedoHierarchalDirsTest(ObjectStorageFixture):
members = self.get_members(["name"], response.content)
expected = 2
recieved = len(members)
received = len(members)
self.assertEqual(
expected,
recieved,
received,
msg="container list with path: {0} expected: {1} members"
" recieved: {2}".format(lvl1_dir_marker, expected, recieved))
" received: {2}".format(lvl1_dir_marker, expected, received))
self.assertIn(
lvl3_obj1,

View File

@ -16,7 +16,7 @@ limitations under the License.
from cloudroast.objectstorage.fixtures import ObjectStorageFixture
STATUS_CODE_MSG = ("{method} expected status code {expected}"
" recieved status code {recieved}")
" received status code {received}")
CONTAINER_NAME = 'account_smoke_test_container'
C_TYPE_TEXT = 'text/plain; charset=utf-8'
C_TYPE_JSON = 'application/json; charset=utf-8'
@ -47,23 +47,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_TEXT
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_format_json_query_parameter(self):
format_ = {"format": "json"}
@ -71,23 +71,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using content-type json"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_JSON
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_format_xml_query_parameter(self):
format_ = {"format": "xml"}
@ -95,23 +95,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using content-type xml"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_XML
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_accept_header(self):
headers = {"Accept": "*/*"}
@ -119,23 +119,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using accept */*"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_TEXT
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_text_accept_header(self):
headers = {"Accept": "text/plain"}
@ -143,23 +143,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using accept text/plain"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_TEXT
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_json_accept_header(self):
headers = {"Accept": "application/json"}
@ -167,23 +167,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using accept application/json"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_JSON
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_xml_accept_header(self):
headers = {"Accept": "application/xml"}
@ -191,23 +191,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using accept application/xml"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_XML
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_limit_query_parameter(self):
limit = {"limit": "10"}
@ -215,23 +215,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using limit query parameter"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_TEXT
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_marker_query_parameter(self):
marker = {"marker": "a"}
@ -239,23 +239,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using marker query parameter"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_TEXT
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_limit_and_marker_query_parameters(self):
limit_marker = {"limit": "3", "marker": "a"}
@ -263,23 +263,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using limit and marker query parameters"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_TEXT
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_limit_marker_format_json(self):
limit_marker_format = {"limit": "3", "marker": "a", "format": "json"}
@ -288,23 +288,23 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using limit, marker, and format json query" \
" parameters"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_JSON
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_container_list_with_limit_marker_format_xml(self):
limit_marker_format = {"limit": "3", "marker": "a", "format": "xml"}
@ -313,38 +313,38 @@ class AccountSmokeTest(ObjectStorageFixture):
method = "list containers using limit, marker, and format xml query" \
" parameters"
expected = HTTP_OK
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
expected = C_TYPE_XML
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'x-account-object-count' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'x-account-object-count' header value expected: {0} received:"
" {1}".format(expected, received))
def test_metadata_retrieval_with_existing_account(self):
response = self.client.get_account_metadata()
method = "account metadata retrieval"
expected = 204
recieved = response.status_code
received = response.status_code
self.assertEqual(
expected,
recieved,
received,
msg=STATUS_CODE_MSG.format(
method=method,
expected=expected,
recieved=str(recieved)))
received=str(received)))
self.assertIn('x-account-bytes-used', response.headers)
@ -357,25 +357,25 @@ class AccountSmokeTest(ObjectStorageFixture):
self.assertIn('x-account-object-count', response.headers)
expected = 'bytes'
recieved = response.headers.get('accept-ranges')
received = response.headers.get('accept-ranges')
self.assertEqual(
expected,
recieved,
msg="'accept-ranges' header value expected: {0} recieved"
" {1}".format(expected, recieved))
received,
msg="'accept-ranges' header value expected: {0} received"
" {1}".format(expected, received))
expected = 0
recieved = int(response.headers.get('content-length'))
received = int(response.headers.get('content-length'))
self.assertEqual(
expected,
recieved,
msg="'content-length' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'content-length' header value expected: {0} received:"
" {1}".format(expected, received))
expected = C_TYPE_TEXT
recieved = response.headers.get('content-type')
received = response.headers.get('content-type')
self.assertEqual(
expected,
recieved,
msg="'content-type' header value expected: {0} recieved:"
" {1}".format(expected, recieved))
received,
msg="'content-type' header value expected: {0} received:"
" {1}".format(expected, received))

View File

@ -90,7 +90,7 @@ class SwiftInfoTest(ObjectStorageFixture):
self.assertEqual(
'application/json; charset=UTF-8',
response.headers.get('content-type'),
"info call should return data in json format, recieved {}"
"info call should return data in json format, received {}"
.format(response.headers.get('content-type')))
info = json.loads(response.content)
self.assertTrue(

View File

@ -568,7 +568,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Access-Control-Allow-Credentials header'
' value expected: {0} recieved: {1}'.format(
' value expected: {0} received: {1}'.format(
expected,
received))
@ -613,7 +613,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Access-Control-Allow-Methods header'
' value expected: {0} recieved: {1}'.format(
' value expected: {0} received: {1}'.format(
expected,
received))
@ -657,7 +657,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Access-Control-Allow-Origin header'
' value expected: {0} recieved: {1}'.format(
' value expected: {0} received: {1}'.format(
expected,
received))
@ -701,7 +701,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Access-Control-Expose-Headers header'
' value expected: {0} recieved: {1}'.format(
' value expected: {0} received: {1}'.format(
expected,
received))
@ -745,7 +745,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Access-Control-Max-Age header'
' value expected: {0} recieved: {1}'.format(
' value expected: {0} received: {1}'.format(
expected,
received))
@ -789,7 +789,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Access-Control-Request-Headers header'
' value expected: {0} recieved: {1}'.format(
' value expected: {0} received: {1}'.format(
expected,
received))
@ -833,7 +833,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Access-Control-Request-Method header'
' value expected: {0} recieved: {1}'.format(
' value expected: {0} received: {1}'.format(
expected,
received))
@ -869,7 +869,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='access-control-allow-origin header should reflect origin'
' expected: {0} recieved: {1}'.format(expected, received))
' expected: {0} received: {1}'.format(expected, received))
@data_driven_test(ObjectDatasetList(exclude=['dlo', 'slo']))
def ddtest_object_creation_with_file_compression(
@ -916,7 +916,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Content-Encoding header value'
' expected: {0} recieved: {1}'.format(expected, received))
' expected: {0} received: {1}'.format(expected, received))
@data_driven_test(ObjectDatasetList())
def ddtest_object_creation_with_content_disposition(
@ -958,7 +958,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with Content-Disposition header value'
' expected: {0} recieved: {1}'.format(expected, received))
' expected: {0} received: {1}'.format(expected, received))
@data_driven_test(ObjectDatasetList())
def ddtest_object_creation_with_x_delete_at(
@ -1002,7 +1002,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with X-Delete-At header value'
' expected: {0} recieved: {1}'.format(expected, received))
' expected: {0} received: {1}'.format(expected, received))
@data_driven_test(ObjectDatasetList())
def ddtest_object_creation_with_delete_after(
@ -1269,7 +1269,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created with X-Object-Meta-Grok header value'
' expected: {0} recieved: {1}'.format(expected, received))
' expected: {0} received: {1}'.format(expected, received))
headers = {'X-Object-Meta-Foo': 'Bar'}
@ -1306,7 +1306,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object X-Object-Meta-Foo header value expected: {0}'
' recieved: {1}'.format(expected, received))
' received: {1}'.format(expected, received))
@data_driven_test(ObjectDatasetList())
def ddtest_obj_metadata_update(self, object_type, generate_object):
@ -1347,7 +1347,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object X-Object-Meta-Grok header value expected: {0}'
' recieved: {1}'.format(expected, received))
' received: {1}'.format(expected, received))
@data_driven_test(ObjectDatasetList())
def ddtest_content_type_not_detected_without_detect_content_type_header(
@ -1373,7 +1373,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created should have content type: {0}'
' recieved: {1}'.format(expected, received))
' received: {1}'.format(expected, received))
response = self.client.get_object(
container_name, object2_name)
@ -1382,7 +1382,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created should have content type: {0}'
' recieved: {1}'.format(expected, received))
' received: {1}'.format(expected, received))
@data_driven_test(ObjectDatasetList())
def ddtest_content_type_detected_with_detect_content_type(
@ -1404,7 +1404,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created should have content type: {0}'
' recieved: {1}'.format(expected, received))
' received: {1}'.format(expected, received))
object2_name = 'object2.txt'
object2_headers = {'X-Detect-Content-Type': True}
@ -1420,7 +1420,7 @@ class ObjectSmokeTest(ObjectStorageFixture):
expected,
received,
msg='object created should have content type: {0}'
' recieved: {1}'.format(expected, received))
' received: {1}'.format(expected, received))
def test_object_creation_via_chunked_transfer(self):
"""