PR#1257: frontend: don't generate 'modules' in build-job unnecessarily - copr/copr

Pavel Raiskup • 4 years ago

95ab28c

file modified

+5 -6

		`@@ -93,11 +93,6 @@`
		`build_record = None`
		`try:`
		`copr_chroot = CoprChrootsLogic.get_by_name_safe(task.build.copr, task.mock_chroot.name)`
		`- enabled_disabled_modules = []`
		`- for module in copr_chroot.module_toggle_array:`
		`- if module:`
		`- enabled_disabled_modules.append({"enable": module})`
		`-`
		`build_record = {`
		`"task_id": task.task_id,`
		`"build_id": task.build.id,`
		`@@ -120,8 +115,12 @@`
		`"package_name": task.build.package.name,`
		`"package_version": task.build.pkg_version,`
		`"uses_devel_repo": task.build.copr.devel_mode,`
		`- "modules": {'toggle': enabled_disabled_modules},`
		`}`
		`+`
		`+ if copr_chroot.module_toggle_array:`
		`+ array = [{'enable': m} for m in copr_chroot.module_toggle_array]`
		`+ build_record["modules"] = {'toggle': array}`
		`+`
		`if short:`
		`return build_record`

file modified

+1 -1

		`@@ -13,7 +13,7 @@`
		`self.c1.copr_chroots[0].module_toggle = ""`
		`r = self.tc.get("/backend/get-build-task/" + str(self.b2.id) + "-fedora-18-x86_64", headers=self.auth_header).data`
		`data = json.loads(r.decode("utf-8"))`
		`- assert data['modules']['toggle'] == []`
		`+ assert 'modules' not in data`

		`def test_module_name_enable(self, f_users, f_coprs, f_mock_chroots, f_builds, f_db):`
		`self.c1.copr_chroots[0].module_toggle = "XXX"`