Differential D864

Fix distgit unittests
ClosedPublic
Actions

Authored by mkrizek on May 24 2016, 2:10 PM.

Details

Reviewers
tflink
Maniphest Tasks
T800: Unittests require file to be present at disk
Commits
rTRGR855e2074d06a: Fix distgit unittests
Test Plan

Unittests pass now

Diff Detail

Repository
rTRGR taskotron-trigger
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to Fix distgit unittests.May 24 2016, 2:10 PM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a reviewer: tflink.
tflink accepted this revision.May 24 2016, 2:21 PM
This revision is now accepted and ready to land.May 24 2016, 2:21 PM
Closed by commit rTRGR855e2074d06a: Fix distgit unittests (authored by mkrizek). · Explain WhyMay 25 2016, 6:53 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mtesting/test_koji_build_trigger.py (15 lines)

Diff 2220

View Options

testing/test_koji_build_trigger.py

Show All 33 Lines14 def prepare(self, monkeypatch):
34 koji_build_msg.config.koji_build_completed_tasks = self.ref_tasks 34​ koji_build_msg.config.koji_build_completed_tasks = self.ref_tasks
35 koji_build_msg.config.docker_build_tasks = self.ref_tasks_docker 35​ koji_build_msg.config.docker_build_tasks = self.ref_tasks_docker
36 koji_build_msg.config.valid_arches = self.ref_validarches 36​ koji_build_msg.config.valid_arches = self.ref_validarches
37 koji_build_msg.config.job_logging = False 37​ koji_build_msg.config.job_logging = False
38 38​
39 mock_get_distgit_tasks = mock.Mock(return_value=[]) 39​ mock_get_distgit_tasks = mock.Mock(return_value=[])
40 monkeypatch.setattr(utils, 'get_distgit_tasks', mock_get_distgit_tasks) 40​ monkeypatch.setattr(utils, 'get_distgit_tasks', mock_get_distgit_tasks)
41 41​
42​ mock_critpath = {"pkgs": {"f18": [], "master": []}}
43​ mock_get_critpath = mock.Mock(return_value=mock_critpath)
44​ monkeypatch.setattr(utils, 'parse_yaml_from_file', mock_get_critpath)
45​
42 def _create_msg(self, ref_instance, ref_new, ref_name, ref_release, ref_version): 46​ def _create_msg(self, ref_instance, ref_new, ref_name, ref_release, ref_version):
43 self.ref_message = Munch(body='{"i": 1,\ 47​ self.ref_message = Munch(body='{"i": 1,\
44 "msg": {"build_id": 221146,\ 48​ "msg": {"build_id": 221146,\
45 "instance": "%s",\ 49​ "instance": "%s",\
46 "new": %d,\ 50​ "new": %d,\
47 "name": "%s",\ 51​ "name": "%s",\
48 "release": "%s",\ 52​ "release": "%s",\
49 "version": "%s"},\ 53​ "version": "%s"},\
Show All 27 Lines71 def test_consume_docker(self):
77 assert trigger_calls[0][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_validarches[0]) 81​ assert trigger_calls[0][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_validarches[0])
78 assert trigger_calls[1][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_validarches[1]) 82​ assert trigger_calls[1][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_validarches[1])
79 assert trigger_calls[2][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks[1], self.ref_validarches[0]) 83​ assert trigger_calls[2][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks[1], self.ref_validarches[0])
80 assert trigger_calls[3][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks[1], self.ref_validarches[1]) 84​ assert trigger_calls[3][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks[1], self.ref_validarches[1])
81 assert trigger_calls[4][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks_docker[0], self.ref_validarches[0]) 85​ assert trigger_calls[4][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks_docker[0], self.ref_validarches[0])
82 assert trigger_calls[5][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks_docker[0], self.ref_validarches[1]) 86​ assert trigger_calls[5][1] == (self.ref_nvr_docker, koji_build_msg.ITEM_TYPE, self.ref_tasks_docker[0], self.ref_validarches[1])
83 87​
84 def test_consume_distgit(self, monkeypatch): 88​ def test_consume_distgit(self, monkeypatch):
85 ref_distgit_task = 'distgit_task' 89​ ref_distgit_task = 'abicheck'
86 mock_get_distgit_tasks = mock.Mock(return_value=[ref_distgit_task]) 90​ mock_get_distgit_tasks = mock.Mock(return_value=[ref_distgit_task])
87 monkeypatch.setattr(utils, 'get_distgit_tasks', mock_get_distgit_tasks) 91​ monkeypatch.setattr(utils, 'get_distgit_tasks', mock_get_distgit_tasks)
92​
93​ mock_critpath = {"pkgs": {"f18": [self.ref_name], "master": []}}
94​ mock_get_critpath = mock.Mock(return_value=mock_critpath)
95​ monkeypatch.setattr(utils, 'parse_yaml_from_file', mock_get_critpath)
96​
88 self.helper.consume(self.ref_message) 97​ self.helper.consume(self.ref_message)
89 98​
90 trigger_calls = self.helper.trigger.trigger_job.calls() 99​ trigger_calls = self.helper.trigger.trigger_job.calls()
91 100​
92 assert len(trigger_calls) == 6 101​ assert len(trigger_calls) == 8
93 102​
94 assert trigger_calls[0][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, ref_distgit_task, self.ref_validarches[0]) 103​ assert trigger_calls[0][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, ref_distgit_task, self.ref_validarches[0])
95 assert trigger_calls[1][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, ref_distgit_task, self.ref_validarches[1]) 104​ assert trigger_calls[1][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, ref_distgit_task, self.ref_validarches[1])
96 assert trigger_calls[2][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_validarches[0]) 105​ assert trigger_calls[2][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_validarches[0])
97 assert trigger_calls[3][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_validarches[1]) 106​ assert trigger_calls[3][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_validarches[1])
98 assert trigger_calls[4][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, self.ref_tasks[1], self.ref_validarches[0]) 107​ assert trigger_calls[4][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, self.ref_tasks[1], self.ref_validarches[0])
99 assert trigger_calls[5][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, self.ref_tasks[1], self.ref_validarches[1]) 108​ assert trigger_calls[5][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, self.ref_tasks[1], self.ref_validarches[1])
109​ assert trigger_calls[6][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, ref_distgit_task, self.ref_validarches[0])
110​ assert trigger_calls[7][1] == (self.ref_nvr, koji_build_msg.ITEM_TYPE, ref_distgit_task, self.ref_validarches[1])
100 111​
101 def test_consume_not_primary_instance(self): 112​ def test_consume_not_primary_instance(self):
102 ref_instance = 'ppc' 113​ ref_instance = 'ppc'
103 self._create_msg(ref_instance, self.ref_new, self.ref_name, self.ref_release, self.ref_version) 114​ self._create_msg(ref_instance, self.ref_new, self.ref_name, self.ref_release, self.ref_version)
104 115​
105 self.helper.consume(self.ref_message) 116​ self.helper.consume(self.ref_message)
106 117​
107 trigger_calls = self.helper.trigger.trigger_job.calls() 118​ trigger_calls = self.helper.trigger.trigger_job.calls()
Show All 22 Lines