diff options
author | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-02-18 15:24:53 +0100 |
---|---|---|
committer | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-02-18 15:24:53 +0100 |
commit | 5e04d306d6d543d7b040f9ccd313be176f5b211b (patch) | |
tree | d601618e03feca37c150373c67a5654e83be33bd | |
parent | bafc254e3204f4ae5f9cd0ef30ef23dbb57cd4d1 (diff) | |
download | openshift-5e04d306d6d543d7b040f9ccd313be176f5b211b.tar.gz openshift-5e04d306d6d543d7b040f9ccd313be176f5b211b.tar.bz2 openshift-5e04d306d6d543d7b040f9ccd313be176f5b211b.tar.xz openshift-5e04d306d6d543d7b040f9ccd313be176f5b211b.zip |
Remove dead code
-rw-r--r-- | roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py | 17 | ||||
-rw-r--r-- | roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py | 17 |
2 files changed, 0 insertions, 34 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 68b6deb88..bcfaa55c8 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 @@ -175,23 +175,6 @@ class TestOpenShiftMasterFactsDefaultPredicates(object): else: assert_equal(results, default_predicates) - def check_defaults_override_vars(self, release, deployment_type, - default_predicates, regions_enabled, - extra_facts=None): - facts = copy.deepcopy(self.default_facts) - facts['openshift']['common']['short_version'] = release - facts['openshift']['common']['deployment_type'] = deployment_type - if extra_facts is not None: - for fact in extra_facts: - facts[fact] = extra_facts[fact] - results = self.lookup.run(None, variables=facts, - regions_enabled=regions_enabled, - return_set_vars=False) - if regions_enabled: - assert_equal(results, default_predicates + [REGION_PREDICATE]) - else: - assert_equal(results, default_predicates) - def test_openshift_version(self): for regions_enabled in (True, False): for release, deployment_type, default_predicates in TEST_VARS: 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 4e44a2b3d..7ddc5dcb2 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 @@ -160,23 +160,6 @@ class TestOpenShiftMasterFactsDefaultPredicates(object): else: assert_equal(results, default_priorities) - def check_defaults_override_vars(self, release, deployment_type, - default_priorities, zones_enabled, - extra_facts=None): - facts = copy.deepcopy(self.default_facts) - facts['openshift']['common']['short_version'] = release - facts['openshift']['common']['deployment_type'] = deployment_type - if extra_facts is not None: - for fact in extra_facts: - facts[fact] = extra_facts[fact] - results = self.lookup.run(None, variables=facts, - zones_enabled=zones_enabled, - return_set_vars=False) - if zones_enabled: - assert_equal(results, default_priorities + [ZONE_PRIORITY]) - else: - assert_equal(results, default_priorities) - def test_openshift_version(self): for zones_enabled in (True, False): for release, deployment_type, default_priorities in TEST_VARS: |