diff options
Diffstat (limited to 'ironic/tests/unit/db/test_conductor.py')
| -rw-r--r-- | ironic/tests/unit/db/test_conductor.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/ironic/tests/unit/db/test_conductor.py b/ironic/tests/unit/db/test_conductor.py index 0187ebca0..efc3a38a3 100644 --- a/ironic/tests/unit/db/test_conductor.py +++ b/ironic/tests/unit/db/test_conductor.py @@ -18,9 +18,6 @@ import datetime from unittest import mock -import oslo_db -from oslo_db import exception as db_exc -from oslo_db import sqlalchemy from oslo_utils import timeutils from ironic.common import exception @@ -158,18 +155,6 @@ class DbConductorTestCase(base.DbTestCase): c = self.dbapi.get_conductor(c.hostname) self.assertEqual(test_time, timeutils.normalize_time(c.updated_at)) - @mock.patch.object(oslo_db.api.time, 'sleep', autospec=True) - @mock.patch.object(sqlalchemy.orm.Query, 'update', autospec=True) - def test_touch_conductor_deadlock(self, mock_update, mock_sleep): - mock_sleep.return_value = None - mock_update.side_effect = [db_exc.DBDeadlock(), None] - c = self._create_test_cdr() - self.dbapi.touch_conductor(c.hostname) - self.assertEqual(2, mock_update.call_count) - # Count that it was called, but not the number of times - # as this is *actually* time.sleep via import from oslo_db.api - self.assertTrue(mock_sleep.called) - def test_touch_conductor_not_found(self): # A conductor's heartbeat will not create a new record, # it will only update existing ones |