openstack/cinder
Code Issues Proposed changes

Merge "Replace use of mox with mock in test_base_filter"

Browse Source
This commit is contained in:
Jenkins 2016-07-08 01:41:14 +00:00 committed by Gerrit Code Review
commit 9da9ebb345
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cinder/tests/unit/scheduler/test_base_filter.py
View File

@ -14,7 +14,6 @@
# limitations under the License. # limitations under the License.
import mock import mock
from oslotest import moxstubout
from cinder.scheduler import base_filter from cinder.scheduler import base_filter
from cinder.scheduler import host_manager from cinder.scheduler import host_manager
@ -26,23 +25,19 @@ class TestBaseFilter(test.TestCase):
def setUp(self): def setUp(self):
super(TestBaseFilter, self).setUp() super(TestBaseFilter, self).setUp()
self.mox = self.useFixture(moxstubout.MoxStubout()).mox
self.filter = base_filter.BaseFilter() self.filter = base_filter.BaseFilter()
def test_filter_one_is_called(self): def test_filter_one_is_called(self):
filters = [1, 2, 3, 4] filters = [1, 2, 3, 4]
filter_properties = {'x': 'y'} filter_properties = {'x': 'y'}
self.mox.StubOutWithMock(self.filter, '_filter_one')
self.filter._filter_one(1, filter_properties).AndReturn(False) self.filter._filter_one = mock.Mock()
self.filter._filter_one(2, filter_properties).AndReturn(True) self.filter._filter_one.side_effect = [False, True, True, False]
self.filter._filter_one(3, filter_properties).AndReturn(True) calls = [mock.call(i, filter_properties) for i in filters]
self.filter._filter_one(4, filter_properties).AndReturn(False)
self.mox.ReplayAll()
result = list(self.filter.filter_all(filters, filter_properties)) result = list(self.filter.filter_all(filters, filter_properties))
self.assertEqual([2, 3], result) self.assertEqual([2, 3], result)
self.filter._filter_one.assert_has_calls(calls)
class FakeExtension(object): class FakeExtension(object):
@ -122,9 +117,8 @@ class TestBaseFilterHandler(test.TestCase):
def setUp(self): def setUp(self):
super(TestBaseFilterHandler, self).setUp() super(TestBaseFilterHandler, self).setUp()
self.stubs = self.useFixture(moxstubout.MoxStubout()).stubs self.mock_object(base_filter.base_handler.extension,
self.stubs.Set(base_filter.base_handler.extension, 'ExtensionManager', 'ExtensionManager', FakeExtensionManager)
FakeExtensionManager)
self.handler = base_filter.BaseFilterHandler(BaseFakeFilter, self.handler = base_filter.BaseFilterHandler(BaseFakeFilter,
'fake_filters') 'fake_filters')