From 4b5618f07927747cc9f3c5eea96e95092d54ccda Mon Sep 17 00:00:00 2001 From: mprahl Date: Tue, 14 May 2019 21:58:42 -0400 Subject: [PATCH] Add scratch to the short JSON This is needed for the MBS-UI PR: https://github.com/release-engineering/mbs-ui/pull/10 --- module_build_service/models.py | 7 ++++--- tests/test_views/test_views.py | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/module_build_service/models.py b/module_build_service/models.py index 7bc1754b..a7a5b5a1 100644 --- a/module_build_service/models.py +++ b/module_build_service/models.py @@ -793,7 +793,7 @@ class ModuleBuild(MBSBase): return query.first() - def short_json(self, show_stream_version=False): + def short_json(self, show_stream_version=False, show_scratch=True): rv = { "id": self.id, "state": self.state, @@ -805,6 +805,8 @@ class ModuleBuild(MBSBase): } if show_stream_version: rv["stream_version"] = self.stream_version + if show_scratch: + rv["scratch"] = self.scratch return rv def json(self, show_tasks=True): @@ -818,7 +820,6 @@ class ModuleBuild(MBSBase): "owner": self.owner, "rebuild_strategy": self.rebuild_strategy, "scmurl": self.scmurl, - "scratch": self.scratch, "srpms": json.loads(self.srpms or "[]"), "siblings": self.siblings, "state_reason": self.state_reason, @@ -845,7 +846,7 @@ class ModuleBuild(MBSBase): state_url = get_url_for("module_build", api_version=api_version, id=self.id) rv.update({ - "base_module_buildrequires": [br.short_json(True) for br in self.buildrequires], + "base_module_buildrequires": [br.short_json(True, False) for br in self.buildrequires], "build_context": self.build_context, "modulemd": self.modulemd, "ref_build_context": self.ref_build_context, diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py index 4f01bf7b..76748361 100644 --- a/tests/test_views/test_views.py +++ b/tests/test_views/test_views.py @@ -191,6 +191,7 @@ class TestViews: assert data["state_name"] == "ready" assert data["stream"] == "1" assert data["version"] == "2" + assert data["scratch"] is False def test_query_build_with_verbose_mode(self): rv = self.client.get("/module-build-service/1/module-builds/2?verbose=true")