diff --git a/oslo/messaging/_utils.py b/oslo/messaging/_utils.py index fcbfd1f1c..532c98b8a 100644 --- a/oslo/messaging/_utils.py +++ b/oslo/messaging/_utils.py @@ -22,8 +22,20 @@ def version_is_compatible(imp_version, version): """ version_parts = version.split('.') imp_version_parts = imp_version.split('.') + try: + rev = version_parts[2] + except IndexError: + rev = 0 + try: + imp_rev = imp_version_parts[2] + except IndexError: + imp_rev = 0 + if int(version_parts[0]) != int(imp_version_parts[0]): # Major return False if int(version_parts[1]) > int(imp_version_parts[1]): # Minor return False + if (int(version_parts[1]) == int(imp_version_parts[1]) and + int(rev) > int(imp_rev)): # Revision + return False return True diff --git a/tests/test_utils.py b/tests/test_utils.py new file mode 100644 index 000000000..b79a59866 --- /dev/null +++ b/tests/test_utils.py @@ -0,0 +1,49 @@ + +# Copyright 2013 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from oslo.messaging import _utils as utils +from tests import utils as test_utils + + +class PoolTestCase(test_utils.BaseTestCase): + def test_version_is_compatible_same(self): + self.assertTrue(utils.version_is_compatible('1.23', '1.23')) + + def test_version_is_compatible_newer_minor(self): + self.assertTrue(utils.version_is_compatible('1.24', '1.23')) + + def test_version_is_compatible_older_minor(self): + self.assertFalse(utils.version_is_compatible('1.22', '1.23')) + + def test_version_is_compatible_major_difference1(self): + self.assertFalse(utils.version_is_compatible('2.23', '1.23')) + + def test_version_is_compatible_major_difference2(self): + self.assertFalse(utils.version_is_compatible('1.23', '2.23')) + + def test_version_is_compatible_newer_rev(self): + self.assertFalse(utils.version_is_compatible('1.23', '1.23.1')) + + def test_version_is_compatible_newer_rev_both(self): + self.assertFalse(utils.version_is_compatible('1.23.1', '1.23.2')) + + def test_version_is_compatible_older_rev_both(self): + self.assertTrue(utils.version_is_compatible('1.23.2', '1.23.1')) + + def test_version_is_compatible_older_rev(self): + self.assertTrue(utils.version_is_compatible('1.24', '1.23.1')) + + def test_version_is_compatible_no_rev_is_zero(self): + self.assertTrue(utils.version_is_compatible('1.23.0', '1.23'))