Merge "Remove test_contains_current_release_entry"

This commit is contained in:
Zuul 2018-02-15 16:52:46 +00:00 committed by Gerrit Code Review
commit d63b2756b5
2 changed files with 2 additions and 11 deletions

View File

@ -57,9 +57,8 @@ Things to do before releasing
It is important to do this before a stable/<release> branch is made (or if
`the grenade switch is made <http://lists.openstack.org/pipermail/openstack-dev/2017-February/111849.html>`_
to use the latest release from stable as the 'old' release).
Otherwise, once it is made, CI (a `unit test
<https://github.com/openstack/ironic/blob/54efd312395a56cbeee5c556df34afd8153c8076/ironic/tests/unit/common/test_release_mappings.py#L68>`_
and grenade that tests new-release -> master) will fail.
Otherwise, once it is made, CI (the grenade job that tests new-release ->
master) will fail.
Things to do after releasing
============================

View File

@ -22,7 +22,6 @@ from ironic.conductor import rpcapi
from ironic.db.sqlalchemy import models
from ironic.objects import base as obj_base
from ironic.tests import base
from ironic import version
def _check_versions_compatibility(conf_version, actual_version):
@ -70,13 +69,6 @@ class ReleaseMappingsTestCase(base.TestCase):
objects = set(mapping['objects'])
self.assertTrue(objects.issubset(registered_objects))
def test_contains_current_release_entry(self):
version_info = str(version.version_info)
# NOTE(sborkows): We only need first two values from version (like 5.1)
# and assume version_info is of the form 'x.y.z'.
current_release = version_info[:version_info.rfind('.')]
self.assertIn(current_release, release_mappings.RELEASE_MAPPING)
def test_current_rpc_version(self):
self.assertEqual(rpcapi.ConductorAPI.RPC_API_VERSION,
release_mappings.RELEASE_MAPPING['master']['rpc'])