From 784fa6c177d07cb4df8ce6f9a0dc3afe41e66975 Mon Sep 17 00:00:00 2001 From: Simon Westphahl Date: Wed, 23 Sep 2020 11:01:56 +0200 Subject: [PATCH] Move driver specific change status field to driver The 'status' field is a driver specific field and should therefore be defined and initialized in the driver specific subclass of a change and not in the 'Change' base class. Change-Id: I0a20041ae8b9f5e4c359fea86c21d1c5c5cbfaca --- zuul/driver/gerrit/gerritmodel.py | 1 + zuul/driver/github/githubmodel.py | 5 ----- zuul/driver/pagure/paguremodel.py | 1 + zuul/model.py | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/zuul/driver/gerrit/gerritmodel.py b/zuul/driver/gerrit/gerritmodel.py index e9043119f5..42d52cc268 100644 --- a/zuul/driver/gerrit/gerritmodel.py +++ b/zuul/driver/gerrit/gerritmodel.py @@ -31,6 +31,7 @@ EMPTY_GIT_REF = '0' * 40 # git sha of all zeros, used during creates/deletes class GerritChange(Change): def __init__(self, project): super(GerritChange, self).__init__(project) + self.status = None self.approvals = [] def update(self, data, connection): diff --git a/zuul/driver/github/githubmodel.py b/zuul/driver/github/githubmodel.py index 8463d07f4d..da06da46fc 100644 --- a/zuul/driver/github/githubmodel.py +++ b/zuul/driver/github/githubmodel.py @@ -47,11 +47,6 @@ class PullRequest(Change): def status(self): return ["{}:{}:{}".format(*c) for c in self.contexts] - @status.setter - def status(self, value): - # Dummy setter to ignore init to None in base class. - pass - @property def successful_contexts(self) -> set: if not self.contexts: diff --git a/zuul/driver/pagure/paguremodel.py b/zuul/driver/pagure/paguremodel.py index f62e7f7874..ebcbb11b7f 100644 --- a/zuul/driver/pagure/paguremodel.py +++ b/zuul/driver/pagure/paguremodel.py @@ -28,6 +28,7 @@ class PullRequest(Change): self.score = 0 self.files = [] self.tags = [] + self.status = None def __repr__(self): r = ['