Merge pull request #571 from pjbreaux/bugfix.test_profiles_11_5_4

During functional testing in 11.5.4 in ltm/profile some tests fail at setup

Author: caphrim007

f5/bigip/mixins.py

@@ -118,8 +118,8 @@ def _check_supported_versions(self, container, attribute):
         minimum = attribute._meta_data['minimum_version']
         if LooseVersion(tmos_v) < LooseVersion(minimum):
             error = "There was an attempt to access resource: \n{}\n which " \
-                    "is not implemented in the device's TMOS version: {}. "\
-                    "The minimum TMOS version in which this resource *is*"\
+                    "is not implemented in the device's TMOS version: {}. " \
+                    "The minimum TMOS version in which this resource *is* " \
                     "supported is {}".format(
                         attribute._meta_data['uri'],
                         tmos_v,

test/functional/tm/ltm/test_profile.py

@@ -231,7 +231,8 @@ def test_CURDL_11_5_4_and_less(self, request, bigip):
         ldap = HelperTest(end_lst, 2)
         with pytest.raises(UnsupportedTmosVersion) as ex:
             ldap.test_CURDL(request, bigip)
-        assert 'Minimum TMOS version supported is 11.6.0' in ex.value.message
+        assert 'minimum TMOS version in which this resource *is* supported ' \
+            'is 11.6.0' in ex.value.message
 
 # End ClientLdap tests
 
@@ -268,7 +269,8 @@ def test_CURDL_11_5_4_and_less(self, request, bigip):
         dhcpv4 = HelperTest(end_lst, 4)
         with pytest.raises(UnsupportedTmosVersion) as ex:
             dhcpv4.test_CURDL(request, bigip)
-        assert 'Minimum TMOS version supported is 11.6.0' in ex.value.message
+        assert 'minimum TMOS version in which this resource *is* supported ' \
+            'is 11.6.0' in ex.value.message
 
 
 # End Dhcpv4 tests
@@ -295,7 +297,8 @@ def test_CURDL_11_5_4_and_less(self, request, bigip):
         dhcpv4 = HelperTest(end_lst, 5)
         with pytest.raises(UnsupportedTmosVersion) as ex:
             dhcpv4.test_CURDL(request, bigip)
-        assert 'Minimum TMOS version supported is 11.6.0' in ex.value.message
+        assert 'minimum TMOS version in which this resource *is* supported ' \
+            'is 11.6.0' in ex.value.message
 # End Dhcpv6 tests
 
 # Begin Diameter tests
@@ -440,7 +443,8 @@ def test_CURDL_11_5_4_and_less(self, request, bigip):
         dhcpv4 = HelperTest(end_lst, 13)
         with pytest.raises(UnsupportedTmosVersion) as ex:
             dhcpv4.test_CURDL(request, bigip)
-        assert 'Minimum TMOS version supported is 11.6.0' in ex.value.message
+        assert 'minimum TMOS version in which this resource *is* supported ' \
+            'is 11.6.0' in ex.value.message
 
 
 # End GTP tests
@@ -500,7 +504,8 @@ def test_CURDL_11_5_4_and_less(self, request, bigip):
         dhcpv4 = HelperTest(end_lst, 17)
         with pytest.raises(UnsupportedTmosVersion) as ex:
             dhcpv4.test_CURDL(request, bigip)
-        assert 'Minimum TMOS version supported is 11.6.0' in ex.value.message
+        assert 'minimum TMOS version in which this resource *is* supported ' \
+            'is 11.6.0' in ex.value.message
 
 
 # End HTTP tests
@@ -682,7 +687,8 @@ def test_CURDL_11_6_and_less(self, request, bigip):
                 trustedCa='/Common/ca-bundle.crt',
                 useProxyServer='disabled'
             )
-        assert 'Minimum TMOS version supported is 11.6.0' in ex.value.message
+        assert 'minimum TMOS version in which this resource *is* supported ' \
+            'is 11.6.0' in ex.value.message
 
 # End Ocsp Stapling Params tests
 
@@ -919,7 +925,8 @@ def test_CURDL_11_5_4_and_less(self, request, bigip):
         dhcpv4 = HelperTest(end_lst, 35)
         with pytest.raises(UnsupportedTmosVersion) as ex:
             dhcpv4.test_CURDL(request, bigip)
-        assert 'Minimum TMOS version supported is 11.6.0' in ex.value.message
+        assert 'minimum TMOS version in which this resource *is* supported ' \
+            'is 11.6.0' in ex.value.message
 
 
 # End Server Ldap tests
@@ -968,7 +975,8 @@ def test_CURDL_11_5_4_and_less(self, request, bigip):
         dhcpv4 = HelperTest(end_lst, 38)
         with pytest.raises(UnsupportedTmosVersion) as ex:
             dhcpv4.test_CURDL(request, bigip)
-        assert 'Minimum TMOS version supported is 11.6.0' in ex.value.message
+        assert 'minimum TMOS version in which this resource *is* supported ' \
+            'is 11.6.0' in ex.value.message
 
 
 # End Smtp tests