openstack/ironic
Code Issues Proposed changes

Merge "Assign valid values to UUIDFields in unit tests"

Browse Source
This commit is contained in:
Jenkins 2016-03-28 23:01:53 +00:00 committed by Gerrit Code Review
commit 7bdfdf048e
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ironic/tests/unit/conductor/test_manager.py
View File

@ -249,13 +249,15 @@ class UpdateNodeTestCase(mgr_utils.ServiceSetUpMixin,
node = obj_utils.create_test_node(self.context, driver='fake',
instance_uuid=None,
power_state=states.NOSTATE)
node.instance_uuid = 'fake-uuid'
uuid1 = uuidutils.generate_uuid()
uuid2 = uuidutils.generate_uuid()
node.instance_uuid = uuid1
self.service.update_node(self.context, node)
# Check if the change was applied
node.instance_uuid = 'meow'
node.instance_uuid = uuid2
node.refresh()
self.assertEqual('fake-uuid', node.instance_uuid)
self.assertEqual(uuid1, node.instance_uuid)
def test_associate_node_powered_off(self):
self._test_associate_node(states.POWER_OFF)
@ -2548,8 +2550,8 @@ class DestroyNodeTestCase(mgr_utils.ServiceSetUpMixin,
def test_destroy_node_associated(self):
self._start_service()
node = obj_utils.create_test_node(self.context,
instance_uuid='fake-uuid')
node = obj_utils.create_test_node(
self.context, instance_uuid=uuidutils.generate_uuid())
exc = self.assertRaises(messaging.rpc.ExpectedException,
self.service.destroy_node,
@ -2577,10 +2579,9 @@ class DestroyNodeTestCase(mgr_utils.ServiceSetUpMixin,
def test_destroy_node_allowed_in_maintenance(self):
self._start_service()
node = obj_utils.create_test_node(self.context,
instance_uuid='fake-uuid',
provision_state=states.ACTIVE,
maintenance=True)
node = obj_utils.create_test_node(
self.context, instance_uuid=uuidutils.generate_uuid(),
provision_state=states.ACTIVE, maintenance=True)
self.service.destroy_node(self.context, node.uuid)
self.assertRaises(exception.NodeNotFound,
self.dbapi.get_node_by_uuid,

3
ironic/tests/unit/drivers/modules/cimc/test_common.py
View File

@ -16,6 +16,7 @@ import mock
from oslo_config import cfg
from oslo_utils import importutils
from oslo_utils import uuidutils
from ironic.common import exception
from ironic.conductor import task_manager
@ -39,7 +40,7 @@ class CIMCBaseTestCase(db_base.DbTestCase):
self.context,
driver='fake_cimc',
driver_info=db_utils.get_test_cimc_info(),
instance_uuid="fake_uuid")
instance_uuid=uuidutils.generate_uuid())
CONF.set_override('max_retry', 2, 'cimc')
CONF.set_override('action_interval', 0, 'cimc')

3
ironic/tests/unit/drivers/modules/ilo/test_power.py
View File

@ -18,6 +18,7 @@
import mock
from oslo_config import cfg
from oslo_utils import importutils
from oslo_utils import uuidutils
from ironic.common import boot_devices
from ironic.common import exception
@ -47,7 +48,7 @@ class IloPowerInternalMethodsTestCase(db_base.DbTestCase):
self.node = db_utils.create_test_node(
driver='fake_ilo',
driver_info=driver_info,
instance_uuid='instance_uuid_123')
instance_uuid=uuidutils.generate_uuid())
CONF.set_override('power_retry', 2, 'ilo')
CONF.set_override('power_wait', 0, 'ilo')

3
ironic/tests/unit/drivers/modules/irmc/test_power.py
View File

@ -18,6 +18,7 @@ Test class for iRMC Power Driver
import mock
from oslo_config import cfg
from oslo_utils import uuidutils
from ironic.common import exception
from ironic.common import states
@ -45,7 +46,7 @@ class IRMCPowerInternalMethodsTestCase(db_base.DbTestCase):
self.node = db_utils.create_test_node(
driver='fake_irmc',
driver_info=driver_info,
instance_uuid='instance_uuid_123')
instance_uuid=uuidutils.generate_uuid())
@mock.patch.object(irmc_boot, 'attach_boot_iso_if_needed')
def test__set_power_state_power_on_ok(