openstack/cinder
Code Issues Proposed changes

Merge "Replace use of mox with mock in test_api_urlmap"

Browse Source
This commit is contained in:
Jenkins 2016-07-04 20:14:08 +00:00 committed by Gerrit Code Review
commit 60b3dfdb02
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cinder/tests/unit/test_api_urlmap.py
View File

@ -17,6 +17,8 @@
Tests for cinder.api.urlmap.py Tests for cinder.api.urlmap.py
""" """
import mock
from cinder.api import urlmap from cinder.api import urlmap
from cinder import test from cinder import test
@ -94,48 +96,53 @@ class TestUrlMapFactory(test.TestCase):
super(TestUrlMapFactory, self).setUp() super(TestUrlMapFactory, self).setUp()
self.global_conf = {'not_found_app': 'app_global', self.global_conf = {'not_found_app': 'app_global',
'domain hoobar.com port 10 /': 'some_app_global'} 'domain hoobar.com port 10 /': 'some_app_global'}
self.loader = self.mox.CreateMockAnything() self.loader = mock.Mock()
def test_not_found_app_in_local_conf(self): def test_not_found_app_in_local_conf(self):
local_conf = {'not_found_app': 'app_local', local_conf = {'not_found_app': 'app_local',
'domain foobar.com port 20 /': 'some_app_local'} 'domain foobar.com port 20 /': 'some_app_local'}
self.loader.get_app('app_local', global_conf=self.global_conf).\
AndReturn('app_local_loader') self.loader.get_app.side_effect = ['app_local_loader',
self.loader.get_app('some_app_local', global_conf=self.global_conf).\ 'some_app_loader']
AndReturn('some_app_loader') calls = [mock.call('app_local', global_conf=self.global_conf),
self.mox.ReplayAll() mock.call('some_app_local', global_conf=self.global_conf)]
expected_urlmap = urlmap.URLMap(not_found_app='app_local_loader') expected_urlmap = urlmap.URLMap(not_found_app='app_local_loader')
expected_urlmap['http://foobar.com:20'] = 'some_app_loader' expected_urlmap['http://foobar.com:20'] = 'some_app_loader'
self.assertEqual(expected_urlmap, self.assertEqual(expected_urlmap,
urlmap.urlmap_factory(self.loader, self.global_conf, urlmap.urlmap_factory(self.loader, self.global_conf,
**local_conf)) **local_conf))
self.loader.get_app.assert_has_calls(calls)
def test_not_found_app_not_in_local_conf(self): def test_not_found_app_not_in_local_conf(self):
local_conf = {'domain foobar.com port 20 /': 'some_app_local'} local_conf = {'domain foobar.com port 20 /': 'some_app_local'}
self.loader.get_app('app_global', global_conf=self.global_conf).\
AndReturn('app_global_loader') self.loader.get_app.side_effect = ['app_global_loader',
self.loader.get_app('some_app_local', global_conf=self.global_conf).\ 'some_app_returned_by_loader']
AndReturn('some_app_returned_by_loader') calls = [mock.call('app_global', global_conf=self.global_conf),
self.mox.ReplayAll() mock.call('some_app_local', global_conf=self.global_conf)]
expected_urlmap = urlmap.URLMap(not_found_app='app_global_loader') expected_urlmap = urlmap.URLMap(not_found_app='app_global_loader')
expected_urlmap['http://foobar.com:20'] = 'some_app_returned'\ expected_urlmap['http://foobar.com:20'] = 'some_app_returned'\
'_by_loader' '_by_loader'
self.assertEqual(expected_urlmap, self.assertEqual(expected_urlmap,
urlmap.urlmap_factory(self.loader, self.global_conf, urlmap.urlmap_factory(self.loader, self.global_conf,
**local_conf)) **local_conf))
self.loader.get_app.assert_has_calls(calls)
def test_not_found_app_is_none(self): def test_not_found_app_is_none(self):
local_conf = {'not_found_app': None, local_conf = {'not_found_app': None,
'domain foobar.com port 20 /': 'some_app_local'} 'domain foobar.com port 20 /': 'some_app_local'}
self.loader.get_app('some_app_local', global_conf=self.global_conf).\ self.loader.get_app.return_value = 'some_app_returned_by_loader'
AndReturn('some_app_returned_by_loader')
self.mox.ReplayAll()
expected_urlmap = urlmap.URLMap(not_found_app=None) expected_urlmap = urlmap.URLMap(not_found_app=None)
expected_urlmap['http://foobar.com:20'] = 'some_app_returned'\ expected_urlmap['http://foobar.com:20'] = 'some_app_returned'\
'_by_loader' '_by_loader'
self.assertEqual(expected_urlmap, self.assertEqual(expected_urlmap,
urlmap.urlmap_factory(self.loader, self.global_conf, urlmap.urlmap_factory(self.loader, self.global_conf,
**local_conf)) **local_conf))
self.loader.get_app.assert_called_once_with(
'some_app_local', global_conf=self.global_conf)
class TestURLMap(test.TestCase): class TestURLMap(test.TestCase):
@ -175,11 +182,11 @@ class TestURLMap(test.TestCase):
def test_path_strategy_wrong_mime_type(self): def test_path_strategy_wrong_mime_type(self):
self.urlmap[('http://10.20.30.40:50', '/path/elsepath/')] = 'app' self.urlmap[('http://10.20.30.40:50', '/path/elsepath/')] = 'app'
self.mox.StubOutWithMock(self.urlmap, '_munge_path') with mock.patch.object(self.urlmap, '_munge_path') as mock_munge_path:
self.urlmap._munge_path('app', '/path/elsepath/resource.abc', mock_munge_path.return_value = 'value'
'/path/elsepath').AndReturn('value') self.assertEqual(
self.mox.ReplayAll() (None, 'value', '/path/elsepath'),
self.assertEqual( self.urlmap._path_strategy('http://10.20.30.40', '50',
(None, 'value', '/path/elsepath'), '/path/elsepath/resource.abc'))
self.urlmap._path_strategy('http://10.20.30.40', '50', mock_munge_path.assert_called_once_with(
'/path/elsepath/resource.abc')) 'app', '/path/elsepath/resource.abc', '/path/elsepath')