Merge "Fix remaining API tests under python3"
This commit is contained in:
commit
97160f90e3
|
@ -108,4 +108,4 @@ class NetworkAPI(DriverPlugin):
|
||||||
"""
|
"""
|
||||||
Get the name for the address
|
Get the name for the address
|
||||||
"""
|
"""
|
||||||
return reversename.from_address(address).to_text()
|
return reversename.from_address(address).to_text().decode('utf-8')
|
||||||
|
|
|
@ -573,7 +573,7 @@ class ApiV2ZonesTest(ApiV2TestCase):
|
||||||
# Check the headers are what we expect
|
# Check the headers are what we expect
|
||||||
self.assertEqual(202, response.status_int)
|
self.assertEqual(202, response.status_int)
|
||||||
self.assertEqual('application/json', response.content_type)
|
self.assertEqual('application/json', response.content_type)
|
||||||
self.assertEqual('""', response.body)
|
self.assertEqual(b'""', response.body)
|
||||||
|
|
||||||
def test_invalid_xfr_request(self):
|
def test_invalid_xfr_request(self):
|
||||||
# Create a zone
|
# Create a zone
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
# Blacklist of tests failing on Python 3
|
# Blacklist of tests failing on Python 3
|
||||||
designate.tests.test_api.test_v2.test_floatingips
|
|
||||||
designate.tests.test_api.test_v2.test_zones
|
|
||||||
designate.tests.test_central.test_service
|
|
||||||
designate.tests.test_pool_manager.test_service
|
designate.tests.test_pool_manager.test_service
|
||||||
designate.tests.unit.test_central.test_basic
|
designate.tests.unit.test_central.test_basic
|
||||||
designate.tests.unit.test_pool
|
designate.tests.unit.test_pool
|
||||||
|
|
Loading…
Reference in New Issue