From c761a572ae14368ad002a911d07d14c5c5c1b703 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 14 Mar 2018 16:17:34 +0800 Subject: bugfix: TestAPI Cookie cannot be found Change-Id: Ibab60aba26e30669dddab74ce61ed00197dc86a8 Signed-off-by: SerenaFeng --- .../testapiclient/tests/unit/fakes.py | 72 ++++++++++ .../testapiclient/tests/unit/test_pods.py | 111 ++++----------- .../testapiclient/tests/unit/test_projects.py | 156 +++++---------------- .../testapiclient/tests/unit/utils.py | 20 ++- 4 files changed, 148 insertions(+), 211 deletions(-) create mode 100644 testapi/testapi-client/testapiclient/tests/unit/fakes.py (limited to 'testapi/testapi-client/testapiclient/tests') diff --git a/testapi/testapi-client/testapiclient/tests/unit/fakes.py b/testapi/testapi-client/testapiclient/tests/unit/fakes.py new file mode 100644 index 0000000..8424745 --- /dev/null +++ b/testapi/testapi-client/testapiclient/tests/unit/fakes.py @@ -0,0 +1,72 @@ +import json +import sys + +import requests +import six +import httplib + + +class FakeResponse(requests.Response): + + def __init__(self, headers=None, status_code=httplib.OK, + data=None, encoding=None): + super(FakeResponse, self).__init__() + + headers = headers or {} + + self.status_code = status_code + + self.headers.update(headers) + if status_code != httplib.OK: + self.reason = data + + self._content = json.dumps(data) + if not isinstance(self._content, six.binary_type): + self._content = self._content.encode() + + +class FakeApp(object): + + def __init__(self, _stdout, _log): + self.stdout = _stdout + self.client_manager = None + self.stdin = sys.stdin + self.stdout = _stdout or sys.stdout + self.stderr = sys.stderr + self.log = _log + + +class FakeLog(object): + + def __init__(self): + self.messages = {} + + def debug(self, msg): + self.messages['debug'] = msg + + def info(self, msg): + self.messages['info'] = msg + + def warning(self, msg): + self.messages['warning'] = msg + + def error(self, msg): + self.messages['error'] = msg + + def critical(self, msg): + self.messages['critical'] = msg + + +class FakeStdout(object): + + def __init__(self): + self.content = [] + + def write(self, text): + self.content.append(text) + + def make_string(self): + result = '' + for line in self.content: + result = result + line + return result diff --git a/testapi/testapi-client/testapiclient/tests/unit/test_pods.py b/testapi/testapi-client/testapiclient/tests/unit/test_pods.py index f531f9f..5d44d4c 100644 --- a/testapi/testapi-client/testapiclient/tests/unit/test_pods.py +++ b/testapi/testapi-client/testapiclient/tests/unit/test_pods.py @@ -1,22 +1,18 @@ -import StringIO -import httplib import json from mock import mock -import requests from six.moves.urllib import parse import testtools from testapiclient.cli import pods +from testapiclient.tests.unit import fakes from testapiclient.tests.unit import utils -from testapiclient.utils import http_client -from testapiclient.utils import user +from testapiclient.utils import clientmanager class PodTest(utils.TestCommand): def setUp(self): super(PodTest, self).setUp() - user.User.session = requests.session() self.base_url = parse.urljoin(self.api_url, 'pods') self.pod_json = { 'role': 'community-ci', @@ -31,47 +27,53 @@ class PodGetTest(PodTest): def setUp(self): super(PodGetTest, self).setUp() - self.get_mock = mock.patch('requests.get').start() - self.get_mock.return_value.status_code = httplib.OK + self.pods_rsp = {'pods': [self.pod_json]} def test_get(self): - pod_get = pods.PodGet(mock.Mock(), mock.Mock()) + self.get_mock.return_value = fakes.FakeResponse(data=self.pods_rsp) + pod_get = pods.PodGet(self.app, mock.Mock()) args = ['-name', 'dfs'] verifies = [('name', 'dfs')] parsed_args = self.check_parser(pod_get, args, verifies) pod_get.take_action(parsed_args) self.get_mock.assert_called_once_with( - self.base_url + '?name=dfs') + self.base_url + '?name=dfs', + headers=clientmanager.ClientManager.headers) def test_get_all(self): - pod_get = pods.PodGet(mock.Mock(), mock.Mock()) + self.get_mock.return_value = fakes.FakeResponse(data=self.pods_rsp) + pod_get = pods.PodGet(self.app, mock.Mock()) args = [] verifies = [] parsed_args = self.check_parser(pod_get, args, verifies) pod_get.take_action(parsed_args) self.get_mock.assert_called_once_with( - self.base_url) + self.base_url, + headers=clientmanager.ClientManager.headers) def test_get_one(self): - pod_get_one = pods.PodGetOne(mock.Mock(), mock.Mock()) + self.get_mock.return_value = fakes.FakeResponse(data=self.pod_json) + pod_get_one = pods.PodGetOne(self.app, mock.Mock()) args = ['def'] verifies = [('name', 'def')] parsed_args = self.check_parser(pod_get_one, args, verifies) pod_get_one.take_action(parsed_args) self.get_mock.assert_called_once_with( - self.base_url + '/def') + self.base_url + '/def', + headers=clientmanager.ClientManager.headers) class PodCreateTest(PodTest): def setUp(self): super(PodCreateTest, self).setUp() - self.post_mock = mock.patch( - 'testapiclient.utils.user.User.session.post').start() - self.post_mock.return_value.status_code = httplib.OK + self.succ_rsp = { + 'href': '{}/{}'.format(self.base_url, self.pod_json.get('name')) + } def test_create_success(self): - pod_create = pods.PodCreate(mock.Mock(), mock.Mock()) + self.post_mock.return_value = fakes.FakeResponse(data=self.succ_rsp) + pod_create = pods.PodCreate(self.app, mock.Mock()) args = [self.pod_string] verifies = [('pod', self.pod_json)] parsed_args = self.check_parser(pod_create, args, verifies) @@ -80,93 +82,36 @@ class PodCreateTest(PodTest): def test_create_failure(self): with testtools.ExpectedException(Exception, 'Create failed: Error'): - pod_create = pods.PodCreate(mock.Mock(), mock.Mock()) - self.post_mock.return_value.status_code = httplib.BAD_REQUEST - self.post_mock.return_value.reason = "Error" + self.post_mock.return_value = utils.FAKE_FAILURE + pod_create = pods.PodCreate(self.app, mock.Mock()) args = [self.pod_string] verifies = [('pod', self.pod_json)] parsed_args = self.check_parser(pod_create, args, verifies) pod_create.take_action(parsed_args) - def test_create_unauthorized(self): - self.mock_unautherized() - with mock.patch('sys.stdout', new=StringIO.StringIO()) as mock_stdout: - with mock.patch('requests.Session') as mock_sessions: - mock_sessions().post.return_value.text = "login" - pod_create = pods.PodCreate(mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', self.pod_string] - verifies = [ - ('u', 'user'), - ('p', 'password'), - ('pod', self.pod_json)] - parsed_args = self.check_parser(pod_create, args, verifies) - pod_create.take_action(parsed_args) - self.assertEqual(mock_stdout.getvalue(), - "Authentication has failed.\n") - - def test_create_authorized(self): - pod_create = pods.PodCreate(mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', self.pod_string] - verifies = [ - ('u', 'user'), - ('p', 'password'), - ('pod', self.pod_json) - ] - parsed_args = self.check_parser(pod_create, args, verifies) - pod_create.take_action(parsed_args) - self.post_mock.assert_called_once() - class PodDeleteTest(PodTest): def setUp(self): super(PodDeleteTest, self).setUp() - self.delete_mock = mock.patch( - 'testapiclient.utils.user.User.session.delete').start() - self.delete_mock.return_value.status_code = httplib.OK def test_delete_success(self): - pod_delete = pods.PodDelete(mock.Mock(), mock.Mock()) + self.delete_mock.return_value = fakes.FakeResponse() + pod_delete = pods.PodDelete(self.app, mock.Mock()) args = ['def'] verifies = [('name', 'def')] parsed_args = self.check_parser(pod_delete, args, verifies) pod_delete.take_action(parsed_args) self.delete_mock.assert_called_once_with( self.base_url + '/def', - data='null', - headers=http_client.HTTPClient.headers) + data=None, + headers=clientmanager.ClientManager.headers) def test_delete_failure(self): with testtools.ExpectedException(Exception, 'Delete failed: Error'): - pod_delete = pods.PodDelete(mock.Mock(), mock.Mock()) - self.delete_mock.return_value.status_code = httplib.FORBIDDEN - self.delete_mock.return_value.reason = "Error" + self.delete_mock.return_value = utils.FAKE_FAILURE + pod_delete = pods.PodDelete(self.app, mock.Mock()) args = ['def'] verifies = [('name', 'def')] parsed_args = self.check_parser(pod_delete, args, verifies) pod_delete.take_action(parsed_args) - - def test_delete_authorized(self): - pod_delete = pods.PodDelete(mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', 'def'] - verifies = [('u', 'user'), ('p', 'password'), ('name', 'def')] - - parsed_args = self.check_parser(pod_delete, args, verifies) - pod_delete.take_action(parsed_args) - self.delete_mock.assert_called_once_with( - self.base_url + '/def', - data='null', - headers=http_client.HTTPClient.headers) - - def test_create_unauthorized(self): - self.mock_unautherized() - with mock.patch('sys.stdout', new=StringIO.StringIO()) as mock_stdout: - with mock.patch('requests.Session') as mock_sessions: - mock_sessions().post.return_value.text = "login" - pod_delete = pods.PodDelete(mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', 'def'] - verifies = [('u', 'user'), ('p', 'password'), ('name', 'def')] - parsed_args = self.check_parser(pod_delete, args, verifies) - pod_delete.take_action(parsed_args) - self.assertEqual(mock_stdout.getvalue(), - "Authentication has failed.\n") diff --git a/testapi/testapi-client/testapiclient/tests/unit/test_projects.py b/testapi/testapi-client/testapiclient/tests/unit/test_projects.py index 6e11329..86486ce 100644 --- a/testapi/testapi-client/testapiclient/tests/unit/test_projects.py +++ b/testapi/testapi-client/testapiclient/tests/unit/test_projects.py @@ -1,22 +1,18 @@ -import StringIO -import httplib import json from mock import mock -import requests from six.moves.urllib import parse import testtools from testapiclient.cli import projects +from testapiclient.tests.unit import fakes from testapiclient.tests.unit import utils -from testapiclient.utils import http_client -from testapiclient.utils import user +from testapiclient.utils import clientmanager class ProjectTest(utils.TestCommand): def setUp(self): super(ProjectTest, self).setUp() - user.User.session = requests.session() self.base_url = parse.urljoin(self.api_url, 'projects') self.project_json = { 'name': 'test_project', @@ -29,47 +25,54 @@ class ProjectGetTest(ProjectTest): def setUp(self): super(ProjectGetTest, self).setUp() - self.get_mock = mock.patch('requests.get').start() - self.get_mock.return_value.status_code = httplib.OK + self.projects_rsp = {'projects': [self.project_json]} def test_get(self): - project_get = projects.ProjectGet(mock.Mock(), mock.Mock()) + self.get_mock.return_value = fakes.FakeResponse(data=self.projects_rsp) + project_get = projects.ProjectGet(self.app, mock.Mock()) args = ['-name', 'dfs'] verifies = [('name', 'dfs')] parsed_args = self.check_parser(project_get, args, verifies) project_get.take_action(parsed_args) self.get_mock.assert_called_once_with( - self.base_url + '?name=dfs') + self.base_url + '?name=dfs', + headers=clientmanager.ClientManager.headers) def test_get_all(self): - project_get = projects.ProjectGet(mock.Mock(), mock.Mock()) + self.get_mock.return_value = fakes.FakeResponse(data=self.projects_rsp) + project_get = projects.ProjectGet(self.app, mock.Mock()) args = [] verifies = [] parsed_args = self.check_parser(project_get, args, verifies) project_get.take_action(parsed_args) self.get_mock.assert_called_once_with( - self.base_url) + self.base_url, + headers=clientmanager.ClientManager.headers) def test_get_one(self): - project_get_one = projects.ProjectGetOne(mock.Mock(), mock.Mock()) + self.get_mock.return_value = fakes.FakeResponse(data=self.project_json) + project_get_one = projects.ProjectGetOne(self.app, mock.Mock()) args = ['def'] verifies = [('name', 'def')] parsed_args = self.check_parser(project_get_one, args, verifies) project_get_one.take_action(parsed_args) self.get_mock.assert_called_once_with( - self.base_url + '/def') + self.base_url + '/def', + headers=clientmanager.ClientManager.headers) class ProjectCreateTest(ProjectTest): def setUp(self): super(ProjectCreateTest, self).setUp() - self.post_mock = mock.patch( - 'testapiclient.utils.user.User.session.post').start() - self.post_mock.return_value.status_code = httplib.OK def test_create_success(self): - project_create = projects.ProjectCreate(mock.Mock(), mock.Mock()) + succ_rsp = { + 'href': '{}/{}'.format(self.base_url, + self.project_json.get('name')) + } + self.post_mock.return_value = fakes.FakeResponse(data=succ_rsp) + project_create = projects.ProjectCreate(self.app, mock.Mock()) args = [self.project_string] verifies = [('project', self.project_json)] parsed_args = self.check_parser(project_create, args, verifies) @@ -78,110 +81,49 @@ class ProjectCreateTest(ProjectTest): def test_create_failure(self): with testtools.ExpectedException(Exception, 'Create failed: Error'): - project_create = projects.ProjectCreate(mock.Mock(), mock.Mock()) - self.post_mock.return_value.status_code = httplib.BAD_REQUEST - self.post_mock.return_value.reason = "Error" + self.post_mock.return_value = utils.FAKE_FAILURE + project_create = projects.ProjectCreate(self.app, mock.Mock()) args = [self.project_string] verifies = [('project', self.project_json)] parsed_args = self.check_parser(project_create, args, verifies) project_create.take_action(parsed_args) - def test_create_unauthorized(self): - self.mock_unautherized() - with mock.patch('sys.stdout', new=StringIO.StringIO()) as mock_stdout: - with mock.patch('requests.Session') as mock_sessions: - mock_sessions().post.return_value.text = "login" - project_create = projects.ProjectCreate( - mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', self.project_string] - verifies = [ - ('u', 'user'), - ('p', 'password'), - ('project', self.project_json)] - parsed_args = self.check_parser(project_create, args, verifies) - project_create.take_action(parsed_args) - self.assertEqual(mock_stdout.getvalue(), - "Authentication has failed.\n") - - def test_create_authorized(self): - project_create = projects.ProjectCreate(mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', self.project_string] - verifies = [ - ('u', 'user'), - ('p', 'password'), - ('project', self.project_json) - ] - parsed_args = self.check_parser(project_create, args, verifies) - project_create.take_action(parsed_args) - self.post_mock.assert_called_once() - class ProjectDeleteTest(ProjectTest): def setUp(self): super(ProjectDeleteTest, self).setUp() - self.delete_mock = mock.patch( - 'testapiclient.utils.user.User.session.delete').start() - self.delete_mock.return_value.status_code = httplib.OK def test_delete_success(self): - project_delete = projects.ProjectDelete(mock.Mock(), mock.Mock()) + self.delete_mock.return_value = fakes.FakeResponse() + project_delete = projects.ProjectDelete(self.app, mock.Mock()) args = ['def'] verifies = [('name', 'def')] parsed_args = self.check_parser(project_delete, args, verifies) project_delete.take_action(parsed_args) self.delete_mock.assert_called_once_with( self.base_url + '/def', - data='null', - headers=http_client.HTTPClient.headers) + data=None, + headers=clientmanager.ClientManager.headers) def test_delete_failure(self): with testtools.ExpectedException(Exception, 'Delete failed: Error'): - project_delete = projects.ProjectDelete(mock.Mock(), mock.Mock()) - self.delete_mock.return_value.status_code = httplib.FORBIDDEN - self.delete_mock.return_value.reason = "Error" + self.delete_mock.return_value = utils.FAKE_FAILURE + project_delete = projects.ProjectDelete(self.app, mock.Mock()) args = ['def'] verifies = [('name', 'def')] parsed_args = self.check_parser(project_delete, args, verifies) project_delete.take_action(parsed_args) - def test_delete_authorized(self): - project_delete = projects.ProjectDelete(mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', 'def'] - verifies = [('u', 'user'), ('p', 'password'), ('name', 'def')] - - parsed_args = self.check_parser(project_delete, args, verifies) - project_delete.take_action(parsed_args) - self.delete_mock.assert_called_once_with( - self.base_url + '/def', - data='null', - headers=http_client.HTTPClient.headers) - - def test_delete_unauthorized(self): - self.mock_unautherized() - with mock.patch('sys.stdout', new=StringIO.StringIO()) as mock_stdout: - with mock.patch('requests.Session') as mock_sessions: - mock_sessions().post.return_value.text = "login" - project_delete = projects.ProjectDelete( - mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', 'def'] - verifies = [('u', 'user'), ('p', 'password'), ('name', 'def')] - parsed_args = self.check_parser(project_delete, args, verifies) - project_delete.take_action(parsed_args) - self.assertEqual(mock_stdout.getvalue(), - "Authentication has failed.\n") - class ProjectPutTest(ProjectTest): def setUp(self): super(ProjectPutTest, self).setUp() - self.put_mock = mock.patch( - 'testapiclient.utils.user.User.session.put').start() - self.put_mock.return_value.status_code = httplib.OK def test_put_success(self): - project_put = projects.ProjectPut(mock.Mock(), mock.Mock()) + self.put_mock.return_value = fakes.FakeResponse(data=self.project_json) + project_put = projects.ProjectPut(self.app, mock.Mock()) args = ['def', self.project_string] verifies = [('name', 'def'), ('project', self.project_json)] parsed_args = self.check_parser(project_put, args, verifies) @@ -190,41 +132,9 @@ class ProjectPutTest(ProjectTest): def test_put_failure(self): with testtools.ExpectedException(Exception, 'Update failed: Error'): - project_put = projects.ProjectPut(mock.Mock(), mock.Mock()) - self.put_mock.return_value.status_code = httplib.BAD_REQUEST - self.put_mock.return_value.reason = "Error" + self.put_mock.return_value = utils.FAKE_FAILURE + project_put = projects.ProjectPut(self.app, mock.Mock()) args = ['def', self.project_string] verifies = [('name', 'def'), ('project', self.project_json)] parsed_args = self.check_parser(project_put, args, verifies) project_put.take_action(parsed_args) - - def test_put_unauthorized(self): - self.mock_unautherized() - with mock.patch('sys.stdout', new=StringIO.StringIO()) as mock_stdout: - with mock.patch('requests.Session') as mock_sessions: - mock_sessions().post.return_value.text = "login" - project_put = projects.ProjectPut(mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', 'def', - self.project_string] - verifies = [ - ('u', 'user'), - ('p', 'password'), - ('name', 'def'), - ('project', self.project_json)] - parsed_args = self.check_parser(project_put, args, verifies) - project_put.take_action(parsed_args) - self.assertEqual(mock_stdout.getvalue(), - "Authentication has failed.\n") - - def test_create_authorized(self): - project_put = projects.ProjectPut(mock.Mock(), mock.Mock()) - args = ['-u', 'user', '-p', 'password', 'def', self.project_string] - verifies = [ - ('u', 'user'), - ('p', 'password'), - ('name', 'def'), - ('project', self.project_json) - ] - parsed_args = self.check_parser(project_put, args, verifies) - project_put.take_action(parsed_args) - self.put_mock.assert_called_once() diff --git a/testapi/testapi-client/testapiclient/tests/unit/utils.py b/testapi/testapi-client/testapiclient/tests/unit/utils.py index 596b7e4..20f9a47 100644 --- a/testapi/testapi-client/testapiclient/tests/unit/utils.py +++ b/testapi/testapi-client/testapiclient/tests/unit/utils.py @@ -1,7 +1,12 @@ -import testtools +import httplib + from mock import mock +import testtools -from testapiclient.utils.user import User +from testapiclient.tests.unit import fakes +from testapiclient.utils import clientmanager + +FAKE_FAILURE = fakes.FakeResponse(status_code=httplib.FORBIDDEN, data='Error') class ParserException(Exception): @@ -24,6 +29,14 @@ class TestCommand(testtools.TestCase): } self.config_mock = mock.patch.dict( 'os.environ', env_variables).start() + self.fake_stdout = fakes.FakeStdout() + self.fake_log = fakes.FakeLog() + self.app = fakes.FakeApp(self.fake_stdout, self.fake_log) + self.app.client_manager = clientmanager.ClientManager() + self.get_mock = mock.patch('requests.Session.get').start() + self.post_mock = mock.patch('requests.Session.post').start() + self.delete_mock = mock.patch('requests.Session.delete').start() + self.put_mock = mock.patch('requests.Session.put').start() def check_parser(self, cmd, args, verify_args): cmd_parser = cmd.get_parser('check_parser') @@ -37,6 +50,3 @@ class TestCommand(testtools.TestCase): self.assertIn(attr, parsed_args) self.assertEqual(value, getattr(parsed_args, attr)) return parsed_args - - def mock_unautherized(self): - User.session = None -- cgit 1.2.3-korg