Merge "Python 2/3 compatible"

This commit is contained in:
Zuul 2018-12-27 02:32:22 +00:00 committed by Gerrit Code Review
commit ead191c3e4
21 changed files with 67 additions and 67 deletions

View File

@ -129,7 +129,7 @@ class SolumClient(rest_client.RestClient):
def create_lp(self, data=None):
sample_lp = dict()
s = string.lowercase
s = string.ascii_lowercase
sample_lp["name"] = "lp" + ''.join(random.sample(s, 5))
lp_url = "https://github.com/murali44/Solum-lp-Go.git"
sample_lp["source_uri"] = lp_url
@ -164,7 +164,7 @@ class SolumClient(rest_client.RestClient):
def delete_created_lps(self):
resp, body = self.get('v1/language_packs')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
[self._delete_language_pack(pl['uuid']) for pl in data]
def _delete_language_pack(self, uuid):
@ -199,9 +199,9 @@ class SolumResponse(object):
self.resp = resp
self.body = body
if body_type == 'json':
self.data = json.loads(self.body)
self.data = json.loads(self.body.decode('utf-8'))
elif body_type == 'yaml':
self.data = yaml.safe_load(self.body)
self.data = yaml.safe_load(self.body.decode('utf-8'))
if self.data.get('uuid'):
self.uuid = self.data.get('uuid')
if self.data.get('id'):
@ -213,11 +213,11 @@ class SolumResponse(object):
@property
def yaml_data(self):
return yaml.safe_load(self.body)
return yaml.safe_load(self.body.decode('utf-8'))
@property
def json_data(self):
return json.loads(self.body)
return json.loads(self.body.decode('utf-8'))
class TestCase(testtools.TestCase):

View File

@ -25,7 +25,7 @@ class PlatformDiscoveryTestCase(base.TestCase):
request_without_auth('camp/platform_endpoints',
'GET'))
self.assertEqual(200, resp.status)
endpoints = json.loads(body)
endpoints = json.loads(body.decode('utf-8'))
self.assertEqual('platform_endpoints', endpoints['type'])
self.assertEqual('Solum_CAMP_endpoints', endpoints['name'])
pe_links = endpoints['platform_endpoint_links']
@ -44,7 +44,7 @@ class PlatformDiscoveryTestCase(base.TestCase):
request_without_auth(rel_ep_url,
'GET'))
self.assertEqual(200, resp.status)
endpoint = json.loads(body)
endpoint = json.loads(body.decode('utf-8'))
self.assertEqual('platform_endpoint', endpoint['type'])
self.assertEqual('Solum_CAMP_v1_1_endpoint', endpoint['name'])
self.assertEqual('CAMP 1.1', endpoint['specification_version'])

View File

@ -67,7 +67,7 @@ class TestAssembliesController(base.TestCase):
self.assertEqual(200, resp.status, 'GET assemblies resource')
# pick out the assemebly link for our new assembly uuid
assemblies_dct = json.loads(body)
assemblies_dct = json.loads(body.decode('utf-8'))
camp_link = None
for link in assemblies_dct['assembly_links']:
link_uuid = link['href'].split("/")[-1]
@ -83,7 +83,7 @@ class TestAssembliesController(base.TestCase):
resp, body = self.client.get(url)
self.assertEqual(200, resp.status, msg)
assembly = json.loads(body)
assembly = json.loads(body.decode('utf-8'))
self.assertEqual('assembly', assembly['type'])
self.assertEqual(base.assembly_sample_data['name'], assembly['name'])

View File

@ -27,7 +27,7 @@ class TestSupportedFormats(base.TestCase):
self.skipTest('CAMP not enabled.')
resp, body = self.client.get('camp/v1_1/formats/')
self.assertEqual(200, resp.status, 'GET formats resource')
formats = json.loads(body)
formats = json.loads(body.decode('utf-8'))
self.assertEqual('formats', formats['type'])
self.assertEqual('Solum_CAMP_formats', formats['name'])
format_links = formats['format_links']
@ -43,7 +43,7 @@ class TestSupportedFormats(base.TestCase):
# get our lone platform_endpoint resource
resp, body = self.client.get(url)
self.assertEqual(200, resp.status, 'GET JSON format resource')
formatr = json.loads(body)
formatr = json.loads(body.decode('utf-8'))
self.assertEqual('format', formatr['type'])
self.assertEqual('JSON', formatr['name'], 'RE-42')
self.assertEqual('application/json', formatr['mime_type'], 'RE-42')

View File

@ -27,7 +27,7 @@ class TestParameterDefinitions(base.TestCase):
self.skipTest('CAMP not enabled.')
resp, body = self.client.get('camp/v1_1/assemblies/')
self.assertEqual(200, resp.status, 'GET assemblies resource')
assemblies = json.loads(body)
assemblies = json.loads(body.decode('utf-8'))
# get the URL of the parameter_definitions resource
url = (assemblies['parameter_definitions_uri']
@ -37,7 +37,7 @@ class TestParameterDefinitions(base.TestCase):
resp, body = self.client.get(url)
self.assertEqual(200, resp.status,
'GET assembly parameter_definitions resource')
pd_resc = json.loads(body)
pd_resc = json.loads(body.decode('utf-8'))
self.assertEqual('parameter_definitions', pd_resc['type'])
self.assertIn('parameter_definition_links', pd_resc)
pd_links = pd_resc['parameter_definition_links']
@ -67,7 +67,7 @@ class TestParameterDefinitions(base.TestCase):
self.skipTest('CAMP not enabled.')
resp, body = self.client.get('camp/v1_1/plans/')
self.assertEqual(200, resp.status, 'GET plans resource')
plans = json.loads(body)
plans = json.loads(body.decode('utf-8'))
# get the URL of the parameter_definitions resource
url = (plans['parameter_definitions_uri']
@ -77,7 +77,7 @@ class TestParameterDefinitions(base.TestCase):
resp, body = self.client.get(url)
self.assertEqual(200, resp.status,
'GET plans parameter_definitions resource')
pd_resc = json.loads(body)
pd_resc = json.loads(body.decode('utf-8'))
self.assertEqual('parameter_definitions', pd_resc['type'])
self.assertIn('parameter_definition_links', pd_resc)
pd_links = pd_resc['parameter_definition_links']

View File

@ -98,7 +98,7 @@ class TestPlansController(base.TestCase):
self.assertEqual(200, resp.status, 'GET plans resource')
# pick out the plan link for our new plan uuid
plans_dct = json.loads(body)
plans_dct = json.loads(body.decode('utf-8'))
camp_link = None
for link in plans_dct['plan_links']:
link_uuid = link['href'].split("/")[-1]
@ -115,7 +115,7 @@ class TestPlansController(base.TestCase):
self.assertEqual(200, resp.status, msg)
# CAMP plans are rendered in JSON
plan = json.loads(body)
plan = json.loads(body.decode('utf-8'))
self.assertEqual(base.plan_sample_data['name'], plan['name'])
self.assertEqual(base.plan_sample_data['description'],
plan['description'])
@ -344,7 +344,7 @@ class TestPlansController(base.TestCase):
uri, patch_json,
headers={'content-type': 'application/json-patch+json'})
self.assertEqual(200, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self.assertIn('tags', json_data)
tags = json_data['tags']
self.assertEqual(2, len(tags))

View File

@ -20,7 +20,7 @@ class TestPlatformAndContainers(base.TestCase):
def _test_get_resource(self, url, rtype, name):
resp, body = self.client.get(url)
self.assertEqual(200, resp.status, 'GET %s resource' % rtype)
resource = json.loads(body)
resource = json.loads(body.decode('utf-8'))
self.assertEqual(rtype, resource['type'])
self.assertEqual(name, resource['name'])
@ -30,7 +30,7 @@ class TestPlatformAndContainers(base.TestCase):
# get and test our platform resource
resp, body = self.client.get('camp/v1_1/platform/')
self.assertEqual(200, resp.status, 'GET platform resource')
platform = json.loads(body)
platform = json.loads(body.decode('utf-8'))
self.assertEqual('platform', platform['type'])
self.assertEqual('Solum_CAMP_v1_1_platform', platform['name'])
self.assertEqual('CAMP 1.1', platform['specification_version'])

View File

@ -21,7 +21,7 @@ class TestTypeDefinitions(base.TestCase):
url = abs_url[len(self.client.base_url) + 1:]
resp, body = self.client.get(url)
self.assertEqual(200, resp.status, msg)
resource = json.loads(body)
resource = json.loads(body.decode('utf-8'))
self.assertEqual(rtype, resource['type'])
self.assertEqual(name, resource['name'])
return body
@ -39,7 +39,7 @@ class TestTypeDefinitions(base.TestCase):
resp, body = self.client.get('camp/v1_1/type_definitions')
self.assertEqual(200, resp.status, 'GET type_definitions resource')
defs_dct = json.loads(body)
defs_dct = json.loads(body.decode('utf-8'))
for link_dct in defs_dct['type_definition_links']:
msg = ("GET type_definition resource for %s" %
link_dct['target_name'])
@ -48,7 +48,7 @@ class TestTypeDefinitions(base.TestCase):
'type_definition',
link_dct['target_name'])
def_dct = json.loads(body)
def_dct = json.loads(body.decode('utf-8'))
for adl_dct in def_dct['attribute_definition_links']:
msg = ("GET attribute_definition resource for %s" %
link_dct['target_name'])

View File

@ -16,7 +16,7 @@ import string
def get_sample_data(languagepack=''):
data = dict()
s = string.lowercase
s = string.ascii_lowercase
data["name"] = "test_app" + ''.join(random.sample(s, 5))
data["description"] = "descp"
data["languagepack"] = languagepack

View File

@ -21,7 +21,7 @@ from solum_tempest_plugin import base
class VersionDiscoveryTestCase(base.TestCase):
def test_get_root_discovers_v1(self):
resp, body = self.client.get('/')
body = json.loads(body)
body = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual(1, len(body))
v1 = body[0]
@ -32,7 +32,7 @@ class VersionDiscoveryTestCase(base.TestCase):
def test_delete_root_discovers_v1(self):
resp, body = self.client.delete('/')
body = json.loads(body)
body = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual(1, len(body))
v1 = body[0]
@ -43,7 +43,7 @@ class VersionDiscoveryTestCase(base.TestCase):
def test_post_root_discovers_v1(self):
resp, body = self.client.post('/', '{}')
body = json.loads(body)
body = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual(1, len(body))
v1 = body[0]
@ -54,7 +54,7 @@ class VersionDiscoveryTestCase(base.TestCase):
def test_put_root_discovers_v1(self):
resp, body = self.client.put('/', '{}')
body = json.loads(body)
body = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual(1, len(body))
v1 = body[0]
@ -66,7 +66,7 @@ class VersionDiscoveryTestCase(base.TestCase):
def test_post_no_body_root_discovers_v1(self):
self.skipTest("POST without body will hang request: #1367470")
resp, body = self.client.post('/', None)
body = json.loads(body)
body = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual(1, len(body))
v1 = body[0]
@ -78,7 +78,7 @@ class VersionDiscoveryTestCase(base.TestCase):
def test_put_no_body_root_discovers_v1(self):
self.skipTest("PUT without body will hang request: #1367470")
resp, body = self.client.put('/', None)
body = json.loads(body)
body = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual(1, len(body))
v1 = body[0]

View File

@ -25,7 +25,7 @@ class TestTriggerController(base.TestCase):
lp_name = self.client.create_lp()
data = apputils.get_sample_data(languagepack=lp_name)
resp = self.client.create_app(data=data)
bdy = json.loads(resp.body)
bdy = json.loads(resp.body.decode('utf-8'))
trigger_uri = bdy['trigger_uri']
# Using requests instead of self.client to test unauthenticated request
status_url = 'https://api.github.com/repos/u/r/statuses/{sha}'
@ -46,7 +46,7 @@ class TestTriggerController(base.TestCase):
lp_name = self.client.create_lp()
data = apputils.get_sample_data(languagepack=lp_name)
resp = self.client.create_app(data=data)
bdy = json.loads(resp.body)
bdy = json.loads(resp.body.decode('utf-8'))
trigger_uri = bdy['trigger_uri']
# Using requests instead of self.client to test unauthenticated request
resp = requests.post(trigger_uri)

View File

@ -96,7 +96,7 @@ class TestAppController(base.TestCase):
headers={'content-type': 'application/json'})
self.assertEqual(200, resp.status)
app_body = json.loads(body)
app_body = json.loads(body.decode('utf-8'))
self.assertEqual('newfakeappname', app_body["name"])
self.assertEqual("newruncmd", app_body["workflow_config"]["run_cmd"])
self.assertEqual("newrepo", app_body["source"]["repository"])
@ -145,7 +145,7 @@ class TestAppController(base.TestCase):
id = create_resp.id
resp, body = self.client.delete_app(id)
self.assertEqual(202, resp.status)
self.assertEqual('', body)
self.assertEqual(b'', body)
time.sleep(2)
self.client.delete_language_pack(lp_name)

View File

@ -70,7 +70,7 @@ class TestAssemblyController(base.TestCase):
self.assertEqual(200, resp.status)
# Search for uuids of created assemblies
assembly_list = json.loads(body)
assembly_list = json.loads(body.decode('utf-8'))
found_uuid_1 = False
found_uuid_2 = False
for assembly in assembly_list:
@ -115,7 +115,7 @@ class TestAssemblyController(base.TestCase):
plan_uuid)
resp, body = self.client.get('v1/assemblies/%s' % uuid)
self.assertEqual(200, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, sample_data)
# Now check that HTTPS is respected. No new assemblies are created.
@ -126,7 +126,7 @@ class TestAssemblyController(base.TestCase):
resp, body = self.client.get('v1/assemblies/%s' % uuid,
headers=use_https)
self.assertEqual(200, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, sample_data)
def test_assemblies_get_not_found(self):
@ -152,7 +152,7 @@ class TestAssemblyController(base.TestCase):
updated_json = json.dumps(updated_data)
resp, body = self.client.put('v1/assemblies/%s' % uuid, updated_json)
self.assertEqual(200, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, updated_data)
def test_assemblies_put_not_found(self):
@ -205,7 +205,7 @@ class TestAssemblyController(base.TestCase):
resp, body = self.client.delete_assembly(uuid)
self.assertEqual(204, resp.status)
self.assertEqual('', body)
self.assertEqual(b'', body)
def test_assemblies_delete_not_found(self):
self.assertRaises(tempest_exceptions.NotFound,

View File

@ -62,7 +62,7 @@ class TestComponentController(base.TestCase):
data = json.dumps(sample_data)
resp, body = self.client.post('v1/components', data)
self.assertEqual(201, resp.status)
out_data = json.loads(body)
out_data = json.loads(body.decode('utf-8'))
uuid = out_data['uuid']
self.assertIsNotNone(uuid)
return uuid, assembly_uuid, plan_uuid
@ -70,7 +70,7 @@ class TestComponentController(base.TestCase):
def test_components_get_all(self):
uuid, assembly_uuid, plan_uuid = self._create_component()
resp, body = self.client.get('v1/components')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
filtered = [com for com in data if com['uuid'] == uuid]
self.assertEqual(1, len(filtered))
@ -91,7 +91,7 @@ class TestComponentController(base.TestCase):
sample_json = json.dumps(sample_data)
resp, body = self.client.post('v1/components', sample_json)
self.assertEqual(201, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, sample_data)
self._delete_component(json_data['uuid'])
@ -105,7 +105,7 @@ class TestComponentController(base.TestCase):
plan_uuid)
resp, body = self.client.get('v1/components/%s' % uuid)
self.assertEqual(200, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, sample_data)
self._delete_component(uuid)
@ -123,7 +123,7 @@ class TestComponentController(base.TestCase):
updated_json = json.dumps(updated_data)
resp, body = self.client.put('v1/components/%s' % uuid, updated_json)
self.assertEqual(200, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, updated_data)
self._delete_component(uuid)
@ -146,7 +146,7 @@ class TestComponentController(base.TestCase):
uuid, assembly_uuid, plan_uuid = self._create_component()
resp, body = self.client.delete('v1/components/%s' % uuid)
self.assertEqual(204, resp.status)
self.assertEqual('', body)
self.assertEqual(b'', body)
def test_components_delete_not_found(self):
self.assertRaises(tempest_exceptions.NotFound,

View File

@ -22,6 +22,6 @@ class TestExtensionController(base.TestCase):
def test_extensions_get_all(self):
resp, body = self.client.get('v1/extensions')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual([], data)

View File

@ -34,7 +34,7 @@ class TestLanguagePackController(base.TestCase):
def _get_sample_languagepack(self):
sample_lp = dict()
s = string.lowercase
s = string.ascii_lowercase
sample_lp["name"] = "lp" + ''.join(random.sample(s, 5))
lp_url = "https://github.com/murali44/Solum-lp-Go.git"
sample_lp["source_uri"] = lp_url
@ -45,7 +45,7 @@ class TestLanguagePackController(base.TestCase):
def _delete_all(self):
resp, body = self.client.get('v1/language_packs')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
[self._delete_language_pack(pl['uuid']) for pl in data]
@ -58,7 +58,7 @@ class TestLanguagePackController(base.TestCase):
jsondata = json.dumps(sample_lp)
resp, body = self.client.post('v1/language_packs', jsondata)
self.assertEqual(201, resp.status)
out_data = json.loads(body)
out_data = json.loads(body.decode('utf-8'))
uuid = out_data['uuid']
self.assertIsNotNone(uuid)
return uuid, sample_lp
@ -66,7 +66,7 @@ class TestLanguagePackController(base.TestCase):
def test_language_packs_get_all(self):
uuid, sample_lp = self._create_language_pack()
resp, body = self.client.get('v1/language_packs')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
filtered = [pl for pl in data if pl['uuid'] == uuid]
self.assertEqual(uuid, filtered[0]['uuid'])
@ -77,7 +77,7 @@ class TestLanguagePackController(base.TestCase):
sample_json = json.dumps(sample_lp)
resp, body = self.client.post('v1/language_packs', sample_json)
self.assertEqual(201, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self.assertEqual("QUEUED", json_data["status"])
self.assertEqual(sample_lp['name'], json_data["name"])
self._delete_language_pack(json_data["uuid"])
@ -90,7 +90,7 @@ class TestLanguagePackController(base.TestCase):
uuid, sample_lp = self._create_language_pack()
resp, body = self.client.get('v1/language_packs/%s' % uuid)
self.assertEqual(200, resp.status)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self.assertEqual(sample_lp['source_uri'], json_data['source_uri'])
self.assertEqual(sample_lp['name'], json_data['name'])
self._delete_language_pack(uuid)
@ -103,7 +103,7 @@ class TestLanguagePackController(base.TestCase):
uuid, sample_lp = self._create_language_pack()
resp, body = self.client.delete('v1/language_packs/%s' % uuid)
self.assertEqual(204, resp.status)
self.assertEqual('', body)
self.assertEqual(b'', body)
def test_language_packs_delete_not_found(self):
self.assertRaises(tempest_exceptions.NotFound,
@ -135,7 +135,7 @@ class TestLanguagePackController(base.TestCase):
self.assertRaises(tempest_exceptions.Conflict,
self.client.delete, 'v1/language_packs/%s' % uuid)
bdy = json.loads(resp.body)
bdy = json.loads(resp.body.decode('utf-8'))
self.client.delete_app(bdy["id"])
# Sleep for a few seconds to make sure plans are deleted.

View File

@ -22,6 +22,6 @@ class TestOperationController(base.TestCase):
def test_operations_get_all(self):
resp, body = self.client.get('v1/operations')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual([], data)

View File

@ -225,7 +225,7 @@ class TestPlanController(base.TestCase):
uuid = create_resp.uuid
resp, body = self.client.delete_plan(uuid)
self.assertEqual(202, resp.status)
self.assertEqual('', body)
self.assertEqual(b'', body)
def test_plans_delete_not_found(self):
self.assertRaises(tempest_exceptions.NotFound,

View File

@ -23,7 +23,7 @@ class TestRootController(base.TestCase):
def test_index(self):
resp, body = self.client.request_without_auth('', 'GET')
self.assertEqual(200, resp.status)
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(data[0]['id'], 'v1.0')
self.assertEqual(data[0]['status'], 'CURRENT')
self.assertEqual(data[0]['link'],
@ -33,7 +33,7 @@ class TestRootController(base.TestCase):
def test_platform(self):
resp, body = self.client.request_without_auth('v1', 'GET')
self.assertEqual(200, resp.status)
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(data['uri'], '%s/v1' % self.client.base_url)
self.assertEqual(data['type'], 'platform')
self.assertEqual(data['name'], 'solum')

View File

@ -22,6 +22,6 @@ class TestSensorController(base.TestCase):
def test_sensors_get_all(self):
resp, body = self.client.get('v1/sensors')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(200, resp.status)
self.assertEqual([], data)

View File

@ -35,7 +35,7 @@ class TestServiceController(base.TestCase):
def _delete_all(self):
resp, body = self.client.get('v1/services')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(resp.status, 200)
[self._delete_service(ser['uuid']) for ser in data]
@ -55,7 +55,7 @@ class TestServiceController(base.TestCase):
jsondata = json.dumps(sample_data)
resp, body = self.client.post('v1/services', jsondata)
self.assertEqual(resp.status, 201)
out_data = json.loads(body)
out_data = json.loads(body.decode('utf-8'))
uuid = out_data['uuid']
self.assertIsNotNone(uuid)
return uuid
@ -63,7 +63,7 @@ class TestServiceController(base.TestCase):
def test_services_get_all(self):
uuid = self._create_service()
resp, body = self.client.get('v1/services')
data = json.loads(body)
data = json.loads(body.decode('utf-8'))
self.assertEqual(resp.status, 200)
filtered = [ser for ser in data if ser['uuid'] == uuid]
self.assertEqual(filtered[0]['uuid'], uuid)
@ -72,7 +72,7 @@ class TestServiceController(base.TestCase):
sample_json = json.dumps(sample_data)
resp, body = self.client.post('v1/services', sample_json)
self.assertEqual(resp.status, 201)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, sample_data)
self._delete_service(json_data['uuid'])
@ -84,7 +84,7 @@ class TestServiceController(base.TestCase):
uuid = self._create_service()
resp, body = self.client.get('v1/services/%s' % uuid)
self.assertEqual(resp.status, 200)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, sample_data)
self._delete_service(uuid)
@ -102,7 +102,7 @@ class TestServiceController(base.TestCase):
updated_json = json.dumps(updated_data)
resp, body = self.client.put('v1/services/%s' % uuid, updated_json)
self.assertEqual(resp.status, 200)
json_data = json.loads(body)
json_data = json.loads(body.decode('utf-8'))
self._assert_output_expected(json_data, updated_data)
self._delete_service(uuid)
@ -125,7 +125,7 @@ class TestServiceController(base.TestCase):
uuid = self._create_service()
resp, body = self.client.delete('v1/services/%s' % uuid)
self.assertEqual(resp.status, 204)
self.assertEqual(body, '')
self.assertEqual(body, b'')
def test_services_delete_not_found(self):
self.assertRaises(tempest_exceptions.NotFound,