Skip to content

Commit d2f69a9

Browse files
committed
Split it out into multiple test cases.
1 parent 0837385 commit d2f69a9

1 file changed

Lines changed: 31 additions & 17 deletions

File tree

codespeed/tests/test_views_data.py

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ def setUp(self):
6161
self.revision_1_custom = Revision.objects.create(
6262
branch=self.branch_custom, commitid='1')
6363

64+
def _insert_mock_revision_objects(self):
65+
self.rev_v4 = Revision.objects.create(
66+
branch=self.branch_master, commitid='4', tag='v4.0.0')
67+
self.rev_v5 = Revision.objects.create(
68+
branch=self.branch_master, commitid='5', tag='v5.0.0')
69+
self.rev_v6 = Revision.objects.create(
70+
branch=self.branch_master, commitid='6', tag='v6.0.0')
71+
6472
def test_get_comparisonexes_master_default_branch(self):
6573
# Standard "master" default branch is used
6674
self.project.default_branch = 'master'
@@ -173,24 +181,26 @@ def test_get_comparisonexes_branch_filtering(self):
173181
for index, exe_key in enumerate(expected_exe_keys):
174182
self.assertEqual(executables[self.project][index]['key'], exe_key)
175183

176-
def test_get_comparisonexes_tag_name_filtering(self):
184+
def test_get_comparisonexes_tag_name_filtering_no_filter_specified(self):
177185
# Insert some mock revisions with tags
178-
rev_v4 = Revision.objects.create(
179-
branch=self.branch_master, commitid='4', tag='v4.0.0')
180-
rev_v5 = Revision.objects.create(
181-
branch=self.branch_master, commitid='5', tag='v5.0.0')
182-
rev_v6 = Revision.objects.create(
183-
branch=self.branch_master, commitid='6', tag='v6.0.0')
186+
self._insert_mock_revision_objects()
184187

185-
# No COMPARIION_TAGS filters specified, all the tags should be included
188+
# No COMPARISON_TAGS filters specified, all the tags should be included
186189
executables, exe_keys = getcomparisonexes()
187190
self.assertEqual(len(executables), 1)
188191
self.assertEqual(len(executables[self.project]), 2 * 2 + 2 * 3)
189192
self.assertEqual(len(exe_keys), 2 * 2 + 2 * 3)
190193

191-
self.assertExecutablesListContainsRevision(executables[self.project], rev_v4)
192-
self.assertExecutablesListContainsRevision(executables[self.project], rev_v5)
193-
self.assertExecutablesListContainsRevision(executables[self.project], rev_v6)
194+
self.assertExecutablesListContainsRevision(executables[self.project],
195+
self.rev_v4)
196+
self.assertExecutablesListContainsRevision(executables[self.project],
197+
self.rev_v5)
198+
self.assertExecutablesListContainsRevision(executables[self.project],
199+
self.rev_v6)
200+
201+
def test_get_comparisonexes_tag_name_filtering_single_tag_specified(self):
202+
# Insert some mock revisions with tags
203+
self._insert_mock_revision_objects()
194204

195205
# Only a single tag should be included
196206
with override_settings(COMPARISON_COMMIT_TAGS=['v4.0.0']):
@@ -200,11 +210,15 @@ def test_get_comparisonexes_tag_name_filtering(self):
200210
self.assertEqual(len(exe_keys), 2 * 2 + 2 * 1)
201211

202212
self.assertExecutablesListContainsRevision(
203-
executables[self.project], rev_v4)
213+
executables[self.project], self.rev_v4)
204214
self.assertExecutablesListDoesntContainRevision(
205-
executables[self.project], rev_v5)
215+
executables[self.project], self.rev_v5)
206216
self.assertExecutablesListDoesntContainRevision(
207-
executables[self.project], rev_v6)
217+
executables[self.project], self.rev_v6)
218+
219+
def test_get_comparisonexes_tag_name_filtering_empty_list_specified(self):
220+
# Insert some mock revisions with tags
221+
self._insert_mock_revision_objects()
208222

209223
# No tags should be included
210224
with override_settings(COMPARISON_COMMIT_TAGS=[]):
@@ -214,11 +228,11 @@ def test_get_comparisonexes_tag_name_filtering(self):
214228
self.assertEqual(len(exe_keys), 2 * 2)
215229

216230
self.assertExecutablesListDoesntContainRevision(
217-
executables[self.project], rev_v4)
231+
executables[self.project], self.rev_v4)
218232
self.assertExecutablesListDoesntContainRevision(
219-
executables[self.project], rev_v5)
233+
executables[self.project], self.rev_v5)
220234
self.assertExecutablesListDoesntContainRevision(
221-
executables[self.project], rev_v6)
235+
executables[self.project], self.rev_v6)
222236

223237
def assertExecutablesListContainsRevision(self, executables, revision):
224238
found = self._executable_list_contains_revision(executables=executables,

0 commit comments

Comments
 (0)