openstack
/
octavia
Code Issues Proposed changes

Merge "Stop using non-existent method of Mock"

This commit is contained in:
Jenkins 2016-02-25 02:10:29 +00:00 committed by Gerrit Code Review
parent 70b8f78447 c31781b122
commit ad84b40f42
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py
View File

@ -422,13 +422,12 @@ class ServerTestCase(base.TestCase):
def test_upload_certificate_md5(self, mock_makedir, mock_chmod,
mock_exists):
# wrong file name
mock_exists.side_effect = [True]
rv = self.app.put('/' + api_server.VERSION +
'/listeners/123/certificates/test.bla',
data='TestTest')
self.assertEqual(400, rv.status_code)
mock_exists.side_effect = [True, True, True]
mock_exists.return_value = True
m = mock.mock_open()
with mock.patch.object(builtins, 'open', m):
@ -441,7 +440,7 @@ class ServerTestCase(base.TestCase):
handle.write.assert_called_once_with(six.b('TestTest'))
mock_chmod.assert_called_once_with(handle.fileno(), 0o600)
mock_exists.side_effect = [True, False]
mock_exists.return_value = False
m = mock.mock_open()
with mock.patch.object(builtins, 'open', m):
@ -452,7 +451,7 @@ class ServerTestCase(base.TestCase):
self.assertEqual(OK, json.loads(rv.data.decode('utf-8')))
handle = m()
handle.write.assert_called_once_with(six.b('TestTest'))
mock_makedir.called_once_with('/var/lib/octavia/123')
mock_makedir.assert_called_once_with('/var/lib/octavia/certs/123')
@mock.patch('os.fchmod')
def test_upload_server_certificate(self, mock_chmod):

7
octavia/tests/functional/amphorae/backend/agent/api_server/test_server_sysvinit.py
View File

@ -428,13 +428,12 @@ class ServerTestCase(base.TestCase):
def test_upload_certificate_md5(self, mock_makedir, mock_chmod,
mock_exists):
# wrong file name
mock_exists.side_effect = [True]
rv = self.app.put('/' + api_server.VERSION +
'/listeners/123/certificates/test.bla',
data='TestTest')
self.assertEqual(400, rv.status_code)
mock_exists.side_effect = [True, True, True]
mock_exists.return_value = True
m = mock.mock_open()
with mock.patch.object(builtins, 'open', m):
@ -447,7 +446,7 @@ class ServerTestCase(base.TestCase):
handle.write.assert_called_once_with(six.b('TestTest'))
mock_chmod.assert_called_once_with(handle.fileno(), 0o600)
mock_exists.side_effect = [True, False]
mock_exists.return_value = False
m = mock.mock_open()
with mock.patch.object(builtins, 'open', m):
@ -458,7 +457,7 @@ class ServerTestCase(base.TestCase):
self.assertEqual(OK, json.loads(rv.data.decode('utf-8')))
handle = m()
handle.write.assert_called_once_with(six.b('TestTest'))
mock_makedir.called_once_with('/var/lib/octavia/123')
mock_makedir.assert_called_once_with('/var/lib/octavia/certs/123')
@mock.patch('os.fchmod')
def test_upload_server_certificate(self, mock_chmod):