diff options
| author | Davanum Srinivas <davanum@gmail.com> | 2015-06-17 17:19:49 -0400 |
|---|---|---|
| committer | Davanum Srinivas (dims) <davanum@gmail.com> | 2015-07-11 02:54:42 +0000 |
| commit | 79b280479c864d7c0f16e6b9fffd30662f2394c6 (patch) | |
| tree | 7a3a2083cbea322c679f6cdcddd1af8da1f51f77 /nova/tests/unit/test_service.py | |
| parent | a0923fc4e27f10f3c1da2a6d0a544ac84a535a7a (diff) | |
| download | nova-79b280479c864d7c0f16e6b9fffd30662f2394c6.tar.gz | |
Switch to oslo.service library
Modules eventlet_backdoor, loopingcall, periodic_task,
service, sslutils, systemd, threadgroup were removed
from nova. These modules were imported from oslo.service
library.
Co-Authored-By: Marian Horban <mhorban@mirantis.com>
Depends-On: I305cf53bad6213c151395e93d656b53a8a28e1db
Change-Id: Iaef67e16af3d69f845742f7bdcb43667bf1576ee
Diffstat (limited to 'nova/tests/unit/test_service.py')
| -rw-r--r-- | nova/tests/unit/test_service.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/tests/unit/test_service.py b/nova/tests/unit/test_service.py index e970380cd2..c3f53617b8 100644 --- a/nova/tests/unit/test_service.py +++ b/nova/tests/unit/test_service.py @@ -24,12 +24,12 @@ import mock from mox3 import mox from oslo_concurrency import processutils from oslo_config import cfg +from oslo_service import service as _service import testtools from nova import exception from nova import manager from nova import objects -from nova.openstack.common import service as _service from nova import rpc from nova import service from nova import test @@ -341,14 +341,16 @@ class TestLauncher(test.NoDBTestCase): def test_launch_app(self, mock_launch): service._launcher = None service.serve(mock.sentinel.service) - mock_launch.assert_called_once_with(mock.sentinel.service, + mock_launch.assert_called_once_with(mock.ANY, + mock.sentinel.service, workers=None) @mock.patch.object(_service, 'launch') def test_launch_app_with_workers(self, mock_launch): service._launcher = None service.serve(mock.sentinel.service, workers=mock.sentinel.workers) - mock_launch.assert_called_once_with(mock.sentinel.service, + mock_launch.assert_called_once_with(mock.ANY, + mock.sentinel.service, workers=mock.sentinel.workers) @mock.patch.object(_service, 'launch') |