openstack
/
keystoneauth
Code Issues Proposed changes

Use Status variables in tests 

A recent change pushed API status definitions into a class:

  I93ee971125bc0c7a497e1fb839df38ebd38340e1

We can reuse this in the tests instead of duplicating the same
string across assertions.

Change-Id: I07a602a05f896d7cc70120bd89424e3c553baf9f
This commit is contained in:
Lance Bragstad 2018-04-25 15:35:56 +00:00 committed by Monty Taylor
parent 4629e3c944
commit 9688b7938b
1 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
keystoneauth1/tests/unit/test_discovery.py
View File

@ -133,7 +133,7 @@ V3_AUTH_RESPONSE = json.dumps({
CINDER_EXAMPLES = { CINDER_EXAMPLES = {
"versions": [ "versions": [
{ {
"status": "CURRENT", "status": discover.Status.CURRENT,
"updated": "2012-01-04T11:33:21Z", "updated": "2012-01-04T11:33:21Z",
"id": "v1.0", "id": "v1.0",
"links": [ "links": [
@ -144,7 +144,7 @@ CINDER_EXAMPLES = {
] ]
}, },
{ {
"status": "CURRENT", "status": discover.Status.CURRENT,
"updated": "2012-11-21T11:33:21Z", "updated": "2012-11-21T11:33:21Z",
"id": "v2.0", "id": "v2.0",
"links": [ "links": [
@ -155,7 +155,7 @@ CINDER_EXAMPLES = {
] ]
}, },
{ {
"status": "CURRENT", "status": discover.Status.CURRENT,
"updated": "2012-11-21T11:33:21Z", "updated": "2012-11-21T11:33:21Z",
"id": "v3.0", "id": "v3.0",
"version": "3.27", "version": "3.27",
@ -179,7 +179,7 @@ CINDER_EXAMPLES = {
GLANCE_EXAMPLES = { GLANCE_EXAMPLES = {
"versions": [ "versions": [
{ {
"status": "CURRENT", "status": discover.Status.CURRENT,
"id": "v2.2", "id": "v2.2",
"links": [ "links": [
{ {
@ -189,7 +189,7 @@ GLANCE_EXAMPLES = {
] ]
}, },
{ {
"status": "SUPPORTED", "status": discover.Status.SUPPORTED,
"id": "v2.1", "id": "v2.1",
"links": [ "links": [
{ {
@ -199,7 +199,7 @@ GLANCE_EXAMPLES = {
] ]
}, },
{ {
"status": "SUPPORTED", "status": discover.Status.SUPPORTED,
"id": "v2.0", "id": "v2.0",
"links": [ "links": [
{ {
@ -209,7 +209,7 @@ GLANCE_EXAMPLES = {
] ]
}, },
{ {
"status": "CURRENT", "status": discover.Status.CURRENT,
"id": "v1.1", "id": "v1.1",
"links": [ "links": [
{ {
@ -219,7 +219,7 @@ GLANCE_EXAMPLES = {
] ]
}, },
{ {
"status": "SUPPORTED", "status": discover.Status.SUPPORTED,
"id": "v1.0", "id": "v1.0",
"links": [ "links": [
{ {
@ -509,7 +509,7 @@ class VersionDataTests(utils.TestCase):
for v in clean_data: for v in clean_data:
self.assertEqual(v['version'], (3, 0)) self.assertEqual(v['version'], (3, 0))
self.assertEqual(v['status'], 'CURRENT') self.assertEqual(v['status'], discover.Status.CURRENT)
self.assertEqual(v['raw_status'], 'stable') self.assertEqual(v['raw_status'], 'stable')
self.assertEqual(v['url'], V3_URL) self.assertEqual(v['url'], V3_URL)
@ -523,7 +523,7 @@ class VersionDataTests(utils.TestCase):
"versions": [ "versions": [
dict( dict(
{ {
"status": "CURRENT", "status": discover.Status.CURRENT,
"id": "v2.2", "id": "v2.2",
"links": [ "links": [
{ {
@ -549,8 +549,8 @@ class VersionDataTests(utils.TestCase):
'collection': None, 'collection': None,
'version': (2, 2), 'version': (2, 2),
'url': V3_URL, 'url': V3_URL,
'status': 'CURRENT', 'status': discover.Status.CURRENT,
'raw_status': 'CURRENT', 'raw_status': discover.Status.CURRENT,
}, },
**versions_out **versions_out
) )
@ -799,7 +799,7 @@ class VersionDataTests(utils.TestCase):
self.assertEqual(3, len(raw_data)) self.assertEqual(3, len(raw_data))
for v in raw_data: for v in raw_data:
self.assertEqual(v['status'], 'CURRENT') self.assertEqual(v['status'], discover.Status.CURRENT)
if v['id'] == 'v1.0': if v['id'] == 'v1.0':
self.assertEqual(v['updated'], '2012-01-04T11:33:21Z') self.assertEqual(v['updated'], '2012-01-04T11:33:21Z')
elif v['id'] == 'v2.0': elif v['id'] == 'v2.0':
@ -822,8 +822,8 @@ class VersionDataTests(utils.TestCase):
'not_before': None, 'not_before': None,
'version': (1, 0), 'version': (1, 0),
'url': v1_url, 'url': v1_url,
'status': 'CURRENT', 'status': discover.Status.CURRENT,
'raw_status': 'CURRENT', 'raw_status': discover.Status.CURRENT,
}, },
{ {
'collection': None, 'collection': None,
@ -833,8 +833,8 @@ class VersionDataTests(utils.TestCase):
'not_before': None, 'not_before': None,
'version': (2, 0), 'version': (2, 0),
'url': v2_url, 'url': v2_url,
'status': 'CURRENT', 'status': discover.Status.CURRENT,
'raw_status': 'CURRENT', 'raw_status': discover.Status.CURRENT,
}, },
{ {
'collection': BASE_URL, 'collection': BASE_URL,
@ -844,8 +844,8 @@ class VersionDataTests(utils.TestCase):
'not_before': u'2019-12-31', 'not_before': u'2019-12-31',
'version': (3, 0), 'version': (3, 0),
'url': v3_url, 'url': v3_url,
'status': 'CURRENT', 'status': discover.Status.CURRENT,
'raw_status': 'CURRENT', 'raw_status': discover.Status.CURRENT,
}, },
]) ])
@ -853,7 +853,7 @@ class VersionDataTests(utils.TestCase):
disc.versioned_data_for(min_version='v2.0', disc.versioned_data_for(min_version='v2.0',
max_version='v2.latest')): max_version='v2.latest')):
self.assertEqual((2, 0), version['version']) self.assertEqual((2, 0), version['version'])
self.assertEqual('CURRENT', version['raw_status']) self.assertEqual(discover.Status.CURRENT, version['raw_status'])
self.assertEqual(v2_url, version['url']) self.assertEqual(v2_url, version['url'])
for version in (disc.data_for(1), for version in (disc.data_for(1),
@ -861,7 +861,7 @@ class VersionDataTests(utils.TestCase):
min_version=(1,), min_version=(1,),
max_version=(1, discover.LATEST))): max_version=(1, discover.LATEST))):
self.assertEqual((1, 0), version['version']) self.assertEqual((1, 0), version['version'])
self.assertEqual('CURRENT', version['raw_status']) self.assertEqual(discover.Status.CURRENT, version['raw_status'])
self.assertEqual(v1_url, version['url']) self.assertEqual(v1_url, version['url'])
self.assertIsNone(disc.url_for('v4')) self.assertIsNone(disc.url_for('v4'))
@ -892,9 +892,9 @@ class VersionDataTests(utils.TestCase):
for v in raw_data: for v in raw_data:
if v['id'] in ('v2.2', 'v1.1'): if v['id'] in ('v2.2', 'v1.1'):
self.assertEqual(v['status'], 'CURRENT') self.assertEqual(v['status'], discover.Status.CURRENT)
elif v['id'] in ('v2.1', 'v2.0', 'v1.0'): elif v['id'] in ('v2.1', 'v2.0', 'v1.0'):
self.assertEqual(v['status'], 'SUPPORTED') self.assertEqual(v['status'], discover.Status.SUPPORTED)
else: else:
self.fail("Invalid version found") self.fail("Invalid version found")
@ -910,8 +910,8 @@ class VersionDataTests(utils.TestCase):
'not_before': None, 'not_before': None,
'version': (1, 0), 'version': (1, 0),
'url': v1_url, 'url': v1_url,
'status': 'SUPPORTED', 'status': discover.Status.SUPPORTED,
'raw_status': 'SUPPORTED', 'raw_status': discover.Status.SUPPORTED,
}, },
{ {
'collection': None, 'collection': None,
@ -921,8 +921,8 @@ class VersionDataTests(utils.TestCase):
'not_before': None, 'not_before': None,
'version': (1, 1), 'version': (1, 1),
'url': v1_url, 'url': v1_url,
'status': 'CURRENT', 'status': discover.Status.CURRENT,
'raw_status': 'CURRENT', 'raw_status': discover.Status.CURRENT,
}, },
{ {
'collection': None, 'collection': None,
@ -932,8 +932,8 @@ class VersionDataTests(utils.TestCase):
'not_before': None, 'not_before': None,
'version': (2, 0), 'version': (2, 0),
'url': v2_url, 'url': v2_url,
'status': 'SUPPORTED', 'status': discover.Status.SUPPORTED,
'raw_status': 'SUPPORTED', 'raw_status': discover.Status.SUPPORTED,
}, },
{ {
'collection': None, 'collection': None,
@ -943,8 +943,8 @@ class VersionDataTests(utils.TestCase):
'not_before': None, 'not_before': None,
'version': (2, 1), 'version': (2, 1),
'url': v2_url, 'url': v2_url,
'status': 'SUPPORTED', 'status': discover.Status.SUPPORTED,
'raw_status': 'SUPPORTED', 'raw_status': discover.Status.SUPPORTED,
}, },
{ {
'collection': None, 'collection': None,
@ -954,8 +954,8 @@ class VersionDataTests(utils.TestCase):
'not_before': None, 'not_before': None,
'version': (2, 2), 'version': (2, 2),
'url': v2_url, 'url': v2_url,
'status': 'CURRENT', 'status': discover.Status.CURRENT,
'raw_status': 'CURRENT', 'raw_status': discover.Status.CURRENT,
}, },
]) ])
@ -965,7 +965,9 @@ class VersionDataTests(utils.TestCase):
min_version=ver, min_version=ver,
max_version=(2, discover.LATEST))): max_version=(2, discover.LATEST))):
self.assertEqual((2, 2), version['version']) self.assertEqual((2, 2), version['version'])
self.assertEqual('CURRENT', version['raw_status']) self.assertEqual(
discover.Status.CURRENT, version['raw_status']
)
self.assertEqual(v2_url, version['url']) self.assertEqual(v2_url, version['url'])
self.assertEqual(v2_url, disc.url_for(ver)) self.assertEqual(v2_url, disc.url_for(ver))
@ -975,7 +977,9 @@ class VersionDataTests(utils.TestCase):
min_version=ver, min_version=ver,
max_version=(1, discover.LATEST))): max_version=(1, discover.LATEST))):
self.assertEqual((1, 1), version['version']) self.assertEqual((1, 1), version['version'])
self.assertEqual('CURRENT', version['raw_status']) self.assertEqual(
discover.Status.CURRENT, version['raw_status']
)
self.assertEqual(v1_url, version['url']) self.assertEqual(v1_url, version['url'])
self.assertEqual(v1_url, disc.url_for(ver)) self.assertEqual(v1_url, disc.url_for(ver))