Removed old version code

This commit removes any references to versions < 1.5/3.5

We assume the version is always greater than or equal to 1.5/3.5.

1 files changed, 0 insertions, 44 deletions

diff --git a/test/openshift_version_tests.py b/test/openshift_version_tests.py
index 6095beb95..36b8263bb 100644
--- a/test/openshift_version_tests.py
+++ b/test/openshift_version_tests.py
@@ -15,50 +15,6 @@ class OpenShiftVersionTests(unittest.TestCase):
 
     openshift_version_filters = openshift_version.FilterModule()
 
-    # Static tests for legacy filters.
-    legacy_gte_tests = [{'name': 'oo_version_gte_3_1_or_1_1',
-                         'positive_openshift-enterprise_version': '3.2.0',
-                         'negative_openshift-enterprise_version': '3.0.0',
-                         'positive_origin_version': '1.2.0',
-                         'negative_origin_version': '1.0.0'},
-                        {'name': 'oo_version_gte_3_1_1_or_1_1_1',
-                         'positive_openshift-enterprise_version': '3.2.0',
-                         'negative_openshift-enterprise_version': '3.1.0',
-                         'positive_origin_version': '1.2.0',
-                         'negative_origin_version': '1.1.0'},
-                        {'name': 'oo_version_gte_3_2_or_1_2',
-                         'positive_openshift-enterprise_version': '3.3.0',
-                         'negative_openshift-enterprise_version': '3.1.0',
-                         'positive_origin_version': '1.3.0',
-                         'negative_origin_version': '1.1.0'},
-                        {'name': 'oo_version_gte_3_3_or_1_3',
-                         'positive_openshift-enterprise_version': '3.4.0',
-                         'negative_openshift-enterprise_version': '3.2.0',
-                         'positive_origin_version': '1.4.0',
-                         'negative_origin_version': '1.2.0'},
-                        {'name': 'oo_version_gte_3_4_or_1_4',
-                         'positive_openshift-enterprise_version': '3.5.0',
-                         'negative_openshift-enterprise_version': '3.3.0',
-                         'positive_origin_version': '1.5.0',
-                         'negative_origin_version': '1.3.0'},
-                        {'name': 'oo_version_gte_3_5_or_1_5',
-                         'positive_openshift-enterprise_version': '3.6.0',
-                         'negative_openshift-enterprise_version': '3.4.0',
-                         'positive_origin_version': '3.6.0',
-                         'negative_origin_version': '1.4.0'}]
-
-    def test_legacy_gte_filters(self):
-        for test in self.legacy_gte_tests:
-            for deployment_type in ['openshift-enterprise', 'origin']:
-                # Test negative case per deployment_type
-                self.assertFalse(
-                    self.openshift_version_filters._filters[test['name']](
-                        test["negative_{}_version".format(deployment_type)], deployment_type))
-                # Test positive case per deployment_type
-                self.assertTrue(
-                    self.openshift_version_filters._filters[test['name']](
-                        test["positive_{}_version".format(deployment_type)], deployment_type))
-
     def test_gte_filters(self):
         for major, minor_start, minor_end in self.openshift_version_filters.versions:
             for minor in range(minor_start, minor_end):