diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2016-12-07 15:36:42 -0500 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-12-07 15:36:42 -0500 |
commit | 9b6f24f271e0776f68073f72a10fb9f83d264cee (patch) | |
tree | 1b88e3641a713a7a34ae793f285a5f002d34c540 /roles/openshift_master_facts/test | |
parent | 4a720359613da16a9cd4ed547dddccee14735aa0 (diff) | |
download | openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.gz openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.bz2 openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.xz openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.zip |
Properly handle x.y.z formatted versions for openshift_release
Diffstat (limited to 'roles/openshift_master_facts/test')
-rw-r--r-- | roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py | 5 | ||||
-rw-r--r-- | roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py b/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py index 0428ad465..8e4037da4 100644 --- a/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py +++ b/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py @@ -211,6 +211,11 @@ class TestOpenShiftMasterFactsDefaultPredicates(object): for release, deployment_type, default_predicates in TEST_VARS: yield self.check_defaults_deployment_type_kwarg, release, deployment_type, default_predicates, regions_enabled + def test_trunc_openshift_release(self): + for release, deployment_type, default_predicates in TEST_VARS: + release = release + '.1' + yield self.check_defaults_release, release, deployment_type, default_predicates, False + @raises(AnsibleError) def test_unknown_deployment_types(self): facts = copy.deepcopy(self.default_facts) diff --git a/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py b/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py index a13b546d1..5427a07a1 100644 --- a/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py +++ b/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py @@ -200,6 +200,11 @@ class TestOpenShiftMasterFactsDefaultPredicates(object): for short_version, deployment_type, default_priorities in TEST_VARS: yield self.check_defaults_short_version_kwarg, short_version, deployment_type, default_priorities, zones_enabled + def test_trunc_openshift_release(self): + for release, deployment_type, default_priorities in TEST_VARS: + release = release + '.1' + yield self.check_defaults_release, release, deployment_type, default_priorities, False + @raises(AnsibleError) def test_unknown_origin_version(self): facts = copy.deepcopy(self.default_facts) |