From f194abaf1a7a88bcd7bdb687eb49dab27dea1734 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Thu, 10 Jan 2019 14:29:20 +1100 Subject: [PATCH] Move the ElectionTestCase into a base module This is so later patches can use the same test base Change-Id: I5fe6aa08942f7d7e4181ad95fe7fc2adfc341ee7 --- openstack_election/tests/base.py | 27 ++++++++++++++++++++++++++ openstack_election/tests/test_utils.py | 17 ++++------------ 2 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 openstack_election/tests/base.py diff --git a/openstack_election/tests/base.py b/openstack_election/tests/base.py new file mode 100644 index 00000000..90d86096 --- /dev/null +++ b/openstack_election/tests/base.py @@ -0,0 +1,27 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from __future__ import absolute_import +from __future__ import print_function +from __future__ import unicode_literals + +import testtools + +from openstack_election.tests import fixtures as election_fixtures + + +class ElectionTestCase(testtools.TestCase): + def setUp(self): + """Run before each test method to initialize test environment.""" + super(ElectionTestCase, self).setUp() + self.output = election_fixtures.OutputStreamCapture() + self.useFixture(self.output) diff --git a/openstack_election/tests/test_utils.py b/openstack_election/tests/test_utils.py index 7dd19d7b..a8c1f48f 100644 --- a/openstack_election/tests/test_utils.py +++ b/openstack_election/tests/test_utils.py @@ -15,22 +15,13 @@ from __future__ import print_function from __future__ import unicode_literals import mock -import testtools from openstack_election import exception -from openstack_election.tests import fixtures as election_fixtures +from openstack_election.tests import base from openstack_election import utils -class ElectionTestCase(testtools.TestCase): - def setUp(self): - """Run before each test method to initialize test environment.""" - super(ElectionTestCase, self).setUp() - self.output = election_fixtures.OutputStreamCapture() - self.useFixture(self.output) - - -class TestGerritUtils(ElectionTestCase): +class TestGerritUtils(base.ElectionTestCase): def test_candidate_files(self): review = {'revisions': { 'Ifake': { @@ -49,7 +40,7 @@ class TestGerritUtils(ElectionTestCase): self.assertEqual(dirname, utils.name2dir(name)) -class TestFindCandidateFiles(ElectionTestCase): +class TestFindCandidateFiles(base.ElectionTestCase): @mock.patch.object(utils, 'is_tc_election', return_value=False) @mock.patch('os.path.exists', return_value=True) @mock.patch('os.listdir', side_effect=[['SomeProject', 'TC'], @@ -71,7 +62,7 @@ class TestFindCandidateFiles(ElectionTestCase): candidate_files) -class TestBuildCandidatesList(ElectionTestCase): +class TestBuildCandidatesList(base.ElectionTestCase): @mock.patch.object(utils, 'lookup_member') @mock.patch.object(utils, 'find_candidate_files') def test_invalid_candidate(self, mock_candidates_list, mock_lookup_member):