From 772284c163c035c3f70d4a9a6b1ed8e4c2b27dfe Mon Sep 17 00:00:00 2001 From: Eric Fried Date: Fri, 1 Sep 2017 16:59:15 -0500 Subject: [PATCH] Extract iterables for test_keystone_version_data As suggested by Lance [1], this change pulls valid version discovery documents into suitably-named iterables in the test case test_discovery.VersionDataTests.test_keystone_version_data. [1] https://review.openstack.org/#/c/483604/11/keystoneauth1/tests/unit/test_discovery.py@625 Change-Id: Icbf3f79f3c697aeb500abd2574f3d75891a47766 --- keystoneauth1/tests/unit/test_discovery.py | 44 ++++++++++++---------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/keystoneauth1/tests/unit/test_discovery.py b/keystoneauth1/tests/unit/test_discovery.py index ec5a15c4..4a219897 100644 --- a/keystoneauth1/tests/unit/test_discovery.py +++ b/keystoneauth1/tests/unit/test_discovery.py @@ -609,30 +609,34 @@ class VersionDataTests(utils.TestCase): self.assertIn(v['version'], ((2, 0), (3, 0))) self.assertEqual(v['raw_status'], 'stable') - for version in (disc.data_for('v3.0'), - disc.data_for('3.latest'), - disc.data_for('latest'), - disc.versioned_data_for( - min_version='v3.0', max_version='v3.latest'), - disc.versioned_data_for(min_version='3'), - disc.versioned_data_for(min_version='3.latest'), - disc.versioned_data_for(min_version='latest'), - disc.versioned_data_for(min_version='3.latest', - max_version='latest'), - disc.versioned_data_for(min_version='latest', - max_version='latest'), - disc.versioned_data_for(min_version=2), - disc.versioned_data_for(min_version='2.latest')): + valid_v3_versions = ( + disc.data_for('v3.0'), + disc.data_for('3.latest'), + disc.data_for('latest'), + disc.versioned_data_for(min_version='v3.0', + max_version='v3.latest'), + disc.versioned_data_for(min_version='3'), + disc.versioned_data_for(min_version='3.latest'), + disc.versioned_data_for(min_version='latest'), + disc.versioned_data_for(min_version='3.latest', + max_version='latest'), + disc.versioned_data_for(min_version='latest', + max_version='latest'), + disc.versioned_data_for(min_version=2), + disc.versioned_data_for(min_version='2.latest')) + for version in valid_v3_versions: self.assertEqual((3, 0), version['version']) self.assertEqual('stable', version['raw_status']) self.assertEqual(V3_URL, version['url']) - for version in (disc.data_for(2), - disc.data_for('2.latest'), - disc.versioned_data_for( - min_version=2, max_version=(2, discover.LATEST)), - disc.versioned_data_for( - min_version='2.latest', max_version='2.latest')): + valid_v2_versions = ( + disc.data_for(2), + disc.data_for('2.latest'), + disc.versioned_data_for(min_version=2, + max_version=(2, discover.LATEST)), + disc.versioned_data_for(min_version='2.latest', + max_version='2.latest')) + for version in valid_v2_versions: self.assertEqual((2, 0), version['version']) self.assertEqual('stable', version['raw_status']) self.assertEqual(V2_URL, version['url'])