Merge "Add third element to RPC versions for backports"
This commit is contained in:
commit
14310fa45f
|
@ -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
|
||||
|
|
|
@ -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'))
|
Loading…
Reference in New Issue