x
/
mixmatch
Code Issues Proposed changes

Stop using six.b and six.u 

For a better developer experience, accomplish removal of six.b and
six.u by changing how Werkzeug response objects are handled in the
relevant unit tests.

Change-Id: Iac36e5fd9eb7ef78e6c8e9e8bff1c596e2e5823e
This commit is contained in:
Jeremy Freudberg 2017-07-28 19:07:53 +00:00
parent 4e18ef34c9
commit a85cf6bf52
3 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mixmatch/tests/unit/test_images.py
View File

@ -13,7 +13,6 @@
# under the License.
import json
import six
import uuid
from mixmatch.tests.unit import base
@ -47,7 +46,7 @@ class TestImages(base.BaseTest):
self.requests_fixture.post(
self._construct_url(sp='default'),
request_headers=self.auth.get_headers(),
text=six.u(image_id),
text=image_id,
headers={'CONTENT-TYPE': 'application/json'}
)
response = self.app.post(
@ -55,14 +54,15 @@ class TestImages(base.BaseTest):
headers=self.auth.get_headers(),
data=json.dumps({'name': 'local'})
)
self.assertEqual(six.b(image_id), response.data)
self.assertEqual(image_id,
response.get_data(as_text=True))
def test_create_image_routing(self):
image_id = uuid.uuid4().hex
self.requests_fixture.post(
self._construct_url(sp='remote1'),
request_headers=self.remote_auth.get_headers(),
text=six.u(image_id),
text=image_id,
headers={'CONTENT-TYPE': 'application/json'}
)
response = self.app.post(
@ -70,7 +70,8 @@ class TestImages(base.BaseTest):
headers=self.auth.get_headers(),
data=json.dumps({'name': 'local@remote1'})
)
self.assertEqual(six.b(image_id), response.data)
self.assertEqual(image_id,
response.get_data(as_text=True))
def test_get_image_local(self):
image_id = uuid.uuid4().hex
@ -81,7 +82,7 @@ class TestImages(base.BaseTest):
self.requests_fixture.get(
self._construct_url(image_id=image_id, sp='default'),
text=six.u(image_data),
text=image_data,
request_headers=self.auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'}
)
@ -90,7 +91,8 @@ class TestImages(base.BaseTest):
headers=self.auth.get_headers()
)
self.assertEqual(response.data, six.b(image_data))
self.assertEqual(response.get_data(as_text=True),
image_data)
def test_get_image_remote(self):
image_id = uuid.uuid4().hex
@ -101,7 +103,7 @@ class TestImages(base.BaseTest):
self.requests_fixture.get(
self._construct_url(image_id=image_id, sp='remote1'),
text=six.u(image_data),
text=image_data,
request_headers=self.remote_auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'}
)
@ -110,7 +112,8 @@ class TestImages(base.BaseTest):
headers=self.auth.get_headers()
)
self.assertEqual(response.data, six.b(image_data))
self.assertEqual(response.get_data(as_text=True),
image_data)
def test_get_image_default_to_local(self):
image_id = uuid.uuid4().hex
@ -118,7 +121,7 @@ class TestImages(base.BaseTest):
self.requests_fixture.get(
self._construct_url(image_id=image_id, sp='default'),
text=six.u(image_data),
text=image_data,
status_code=400,
request_headers=self.auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'}
@ -137,7 +140,7 @@ class TestImages(base.BaseTest):
self.requests_fixture.get(
self._construct_url(image_id=image_id, sp='default'),
text=six.u(image_data),
text=image_data,
status_code=200,
request_headers=self.auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'}
@ -150,7 +153,8 @@ class TestImages(base.BaseTest):
)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data, six.b(image_data))
self.assertEqual(response.get_data(as_text=True),
image_data)
def test_get_image_search_remote(self):
self.config_fixture.load_raw_values(search_by_broadcast=True)
@ -165,7 +169,7 @@ class TestImages(base.BaseTest):
)
self.requests_fixture.get(
self._construct_url(image_id=image_id, sp='remote1'),
text=six.u(image_data),
text=image_data,
status_code=200,
request_headers=self.remote_auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'}
@ -176,7 +180,8 @@ class TestImages(base.BaseTest):
)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data, six.b(image_data))
self.assertEqual(response.get_data(as_text=True),
image_data)
def test_get_image_search_nexists(self):
self.config_fixture.load_raw_values(search_by_broadcast=True)
@ -223,7 +228,7 @@ class TestImages(base.BaseTest):
EXPECTED = samples.single_sp['/image/v2/images']
EXPECTED['images'].sort(key=lambda x: x['id'])
actual = json.loads(response.data.decode("ascii"))
actual = json.loads(response.get_data(as_text=True))
actual['images'].sort(key=lambda x: x['id'])
self.assertEqual(actual, EXPECTED)
@ -232,7 +237,7 @@ class TestImages(base.BaseTest):
'/image',
headers=self.auth.get_headers()
)
actual = json.loads(response.data.decode("ascii"))
actual = json.loads(response.get_data(as_text=True))
self.assertEqual(response.status_code, 200)
self.assertEqual(len(actual['versions']), 6)

4
mixmatch/tests/unit/test_request_handler.py
View File

@ -110,7 +110,7 @@ class TestRequestHandler(BaseTest):
'/image/v2/images',
headers={'X-AUTH-TOKEN': 'local-tok',
'CONTENT-TYPE': 'application/json'})
actual = json.loads(response.data.decode("ascii"))
actual = json.loads(response.get_data(as_text=True))
self.assertEqual(actual, LOCAL_IMAGES)
def test_toggle_services_no_sps(self):
@ -132,5 +132,5 @@ class TestRequestHandler(BaseTest):
'/image/v2/images',
headers={'X-AUTH-TOKEN': 'local-tok',
'CONTENT-TYPE': 'application/json'})
actual = json.loads(response.data.decode("ascii"))
actual = json.loads(response.get_data(as_text=True))
self.assertEqual(actual, {'images': []})

56
mixmatch/tests/unit/test_volumes.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import six
import json
import uuid
@ -56,14 +55,15 @@ class TestVolumesV3(base.BaseTest):
resource_type='messages',
sp='default'),
request_headers=self.auth.get_headers(),
text=six.u(fake_message_list),
text=fake_message_list,
headers={'CONTENT-TYPE': 'application/json'}
)
response = self.app.get(
self._construct_url(self.auth, resource_type='messages'),
headers=self.auth.get_headers()
)
self.assertEqual(response.data, six.b(fake_message_list))
self.assertEqual(response.get_data(as_text=True),
fake_message_list)
def test_get_message(self):
fake_message = uuid.uuid4().hex
@ -74,7 +74,7 @@ class TestVolumesV3(base.BaseTest):
resource_type='messages',
sp='default'),
request_headers=self.auth.get_headers(),
text=six.u(fake_message),
text=fake_message,
headers={'CONTENT-TYPE': 'application/json'}
)
response = self.app.get(
@ -82,7 +82,8 @@ class TestVolumesV3(base.BaseTest):
resource_type='messages'),
headers=self.auth.get_headers()
)
self.assertEqual(response.data, six.b(fake_message))
self.assertEqual(response.get_data(as_text=True),
fake_message)
class TestVolumesV2(base.BaseTest):
@ -111,7 +112,7 @@ class TestVolumesV2(base.BaseTest):
self.requests_fixture.post(
self._construct_url(self.auth, sp='default'),
request_headers=self.auth.get_headers(),
text=six.u(volume_id),
text=volume_id,
headers={'CONTENT-TYPE': 'application/json'}
)
response = self.app.post(
@ -119,14 +120,15 @@ class TestVolumesV2(base.BaseTest):
headers=self.auth.get_headers(),
data=json.dumps({'volume': {'name': 'local'}})
)
self.assertEqual(six.b(volume_id), response.data)
self.assertEqual(volume_id,
response.get_data(as_text=True))
def test_create_volume_routing(self):
volume_id = uuid.uuid4().hex
self.requests_fixture.post(
self._construct_url(self.remote_auth, sp='remote1'),
request_headers=self.remote_auth.get_headers(),
text=six.u(volume_id),
text=volume_id,
headers={'CONTENT-TYPE': 'application/json'}
)
response = self.app.post(
@ -134,7 +136,8 @@ class TestVolumesV2(base.BaseTest):
headers=self.auth.get_headers(),
data=json.dumps({'volume': {'name': 'local@remote1'}})
)
self.assertEqual(six.b(volume_id), response.data)
self.assertEqual(volume_id,
response.get_data(as_text=True))
def test_get_volume_local_mapping(self):
volume_id = uuid.uuid4().hex
@ -147,14 +150,15 @@ class TestVolumesV2(base.BaseTest):
self.requests_fixture.get(
self._construct_url(self.auth, volume_id, sp='default'),
request_headers=self.auth.get_headers(),
text=six.u(volume_id),
text=volume_id,
headers={'CONTENT-TYPE': 'application/json'}
)
response = self.app.get(
self._construct_url(self.auth, volume_id),
headers=self.auth.get_headers()
)
self.assertEqual(response.data, six.b(volume_id))
self.assertEqual(response.get_data(as_text=True),
volume_id)
def test_get_volume_remote_mapping(self):
volume_id = uuid.uuid4().hex
@ -164,20 +168,21 @@ class TestVolumesV2(base.BaseTest):
self.requests_fixture.get(
self._construct_url(self.remote_auth, volume_id, sp='remote1'),
text=six.u(volume_id),
text=volume_id,
request_headers=self.remote_auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'})
response = self.app.get(
self._construct_url(self.remote_auth, volume_id),
headers=self.auth.get_headers())
self.assertEqual(response.data, six.b(volume_id))
self.assertEqual(response.get_data(as_text=True),
volume_id)
def test_get_volume_no_search(self):
volume_id = uuid.uuid4().hex
self.requests_fixture.get(
self._construct_url(self.auth, volume_id, sp='default'),
text=six.u(volume_id),
text=volume_id,
status_code=404,
request_headers=self.auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'})
@ -193,7 +198,7 @@ class TestVolumesV2(base.BaseTest):
self.requests_fixture.get(
self._construct_url(self.auth, volume_id, sp='default'),
text=six.u(volume_id),
text=volume_id,
status_code=200,
request_headers=self.auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'})
@ -204,7 +209,8 @@ class TestVolumesV2(base.BaseTest):
self._construct_url(self.auth, volume_id),
headers=self.auth.get_headers())
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data, six.b(volume_id))
self.assertEqual(response.get_data(as_text=True),
volume_id)
def test_get_volume_search_remote(self):
self.config_fixture.load_raw_values(search_by_broadcast=True)
@ -218,7 +224,7 @@ class TestVolumesV2(base.BaseTest):
headers={'CONTENT-TYPE': 'application/json'})
self.requests_fixture.get(
self._construct_url(self.remote_auth, volume_id, sp='remote1'),
text=six.u(volume_id),
text=volume_id,
status_code=200,
request_headers=self.remote_auth.get_headers(),
headers={'CONTENT-TYPE': 'application/json'})
@ -227,7 +233,8 @@ class TestVolumesV2(base.BaseTest):
self._construct_url(self.auth, volume_id),
headers=self.auth.get_headers())
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data, six.b(volume_id))
self.assertEqual(response.get_data(as_text=True),
volume_id)
def test_get_volume_search_nexists(self):
self.config_fixture.load_raw_values(search_by_broadcast=True)
@ -273,7 +280,7 @@ class TestVolumesV2(base.BaseTest):
response = self.app.get(
'/volume/v2/%s/volumes' % self.auth.get_project_id(),
headers=self.auth.get_headers())
actual = json.loads(response.data.decode("ascii"))
actual = json.loads(response.get_data(as_text=True))
actual['volumes'].sort(key=lambda x: x[u'id'])
EXPECTED = samples.single_sp['/volume/v2/id/volumes']
EXPECTED['volumes'].sort(key=lambda x: x[u'id'])
@ -309,7 +316,7 @@ class TestVolumesV2(base.BaseTest):
response = self.app.get(
'/volume/v2/%s/volumes/detail' % self.auth.get_project_id(),
headers=self.auth.get_headers())
actual = json.loads(response.data.decode("ascii"))
actual = json.loads(response.get_data(as_text=True))
actual['volumes'].sort(key=lambda x: x[u'id'])
EXPECTED = samples.single_sp['/volume/v2/id/volumes/detail']
EXPECTED['volumes'].sort(key=lambda x: x[u'id'])
@ -328,14 +335,14 @@ class TestVolumesV2(base.BaseTest):
response = self.app.get(
self._construct_url(self.auth, 'detail'),
headers=self.auth.get_headers())
self.assertEqual(json.loads(response.data.decode("ascii")), local)
self.assertEqual(json.loads(response.get_data(as_text=True)), local)
def test_volume_unversioned_calls_no_action_aggregation(self):
response = self.app.get(
'/volume',
headers=self.auth.get_headers())
self.assertEqual(response.status_code, 200)
actual = json.loads(response.data.decode("ascii"))
actual = json.loads(response.get_data(as_text=True))
self.assertEqual(len(actual['versions']), 3)
def test_unversioned_call_no_action_no_aggregation(self):
@ -343,12 +350,13 @@ class TestVolumesV2(base.BaseTest):
fake_response = uuid.uuid4().hex
self.requests_fixture.get(self._construct_url(sp='default'),
text=six.u(fake_response),
text=fake_response,
headers={'CONTENT-TYPE': 'application/json'})
response = self.app.get('/volume')
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data, six.b(fake_response))
self.assertEqual(response.get_data(as_text=True),
fake_response)
def test_volume_versioned_calls_no_action(self):
response = self.app.get(