From fccb61c5182c4a36f525215c8148f898e7944690 Mon Sep 17 00:00:00 2001 From: Qixiang Wan Date: Jun 16 2017 06:16:09 +0000 Subject: Rename dep_of to dep_on The name of 'dep_of' is different with its meaning, change to 'dep_on' which is more accurate. --- diff --git a/freshmaker/api_utils.py b/freshmaker/api_utils.py index bfc1cbd..d9b1e34 100644 --- a/freshmaker/api_utils.py +++ b/freshmaker/api_utils.py @@ -85,7 +85,7 @@ def filter_artifact_builds(flask_request): else: raise ValueError('An invalid state was supplied') - for key in ['name', 'event_id', 'dep_of_id', 'build_id']: + for key in ['name', 'event_id', 'dep_on_id', 'build_id']: if flask_request.args.get(key, None): search_query[key] = flask_request.args[key] diff --git a/freshmaker/handlers/__init__.py b/freshmaker/handlers/__init__.py index cdfaf9b..e995ca0 100644 --- a/freshmaker/handlers/__init__.py +++ b/freshmaker/handlers/__init__.py @@ -96,7 +96,7 @@ class BaseHandler(object): namespace=namespace, scratch=conf.koji_container_scratch_build) - def record_build(self, event, name, artifact_type, build_id, dep_of=None): + def record_build(self, event, name, artifact_type, build_id, dep_on=None): """ Record build in db. @@ -108,7 +108,7 @@ class BaseHandler(object): """ ev = models.Event.get_or_create(db.session, event.msg_id, event.search_key, event.__class__) - models.ArtifactBuild.create(db.session, ev, name, artifact_type.name.lower(), build_id, dep_of) + models.ArtifactBuild.create(db.session, ev, name, artifact_type.name.lower(), build_id, dep_on) db.session.commit() def allow_build(self, artifact_type, name, branch): diff --git a/freshmaker/handlers/mbs/module_state_change.py b/freshmaker/handlers/mbs/module_state_change.py index ddd8982..6d2678e 100644 --- a/freshmaker/handlers/mbs/module_state_change.py +++ b/freshmaker/handlers/mbs/module_state_change.py @@ -75,7 +75,7 @@ class MBSModuleStateChangeHandler(BaseHandler): if module_build: # we have this build recorded in DB, check to prevent # cyclic build loop - root_dep = module_build.get_root_dep_of() + root_dep = module_build.get_root_dep_on() if root_dep and root_dep.name == module_name: log.info("Skipping the rebuild triggered by %s:%s as it will" "result in cyclic build loop.", module_name, module_stream) @@ -98,6 +98,6 @@ class MBSModuleStateChangeHandler(BaseHandler): rev = utils.bump_distgit_repo('modules', name, branch=version, commit_msg=commit_msg, logger=log) new_build_id = self.build_module(name, version, rev) if new_build_id is not None: - self.record_build(event, name, ArtifactType.MODULE, new_build_id, dep_of=module_build) + self.record_build(event, name, ArtifactType.MODULE, new_build_id, dep_on=module_build) return [] diff --git a/freshmaker/models.py b/freshmaker/models.py index df6516f..d66ad7e 100644 --- a/freshmaker/models.py +++ b/freshmaker/models.py @@ -113,8 +113,8 @@ class ArtifactBuild(FreshmakerBase): # Link to the Artifact on which this one depends and which triggered # the rebuild of this Artifact. - dep_of_id = db.Column(db.Integer, db.ForeignKey('artifact_builds.id')) - dep_of = relationship('ArtifactBuild', remote_side=[id]) + dep_on_id = db.Column(db.Integer, db.ForeignKey('artifact_builds.id')) + dep_on = relationship('ArtifactBuild', remote_side=[id]) # Event associated with this Build event_id = db.Column(db.Integer, db.ForeignKey('events.id')) @@ -124,7 +124,7 @@ class ArtifactBuild(FreshmakerBase): build_id = db.Column(db.Integer) @classmethod - def create(cls, session, event, name, type, build_id, dep_of=None): + def create(cls, session, event, name, type, build_id, dep_on=None): now = datetime.utcnow() build = cls( name=name, @@ -133,7 +133,7 @@ class ArtifactBuild(FreshmakerBase): state="build", build_id=build_id, time_submitted=now, - dep_of=dep_of + dep_on=dep_on ) session.add(build) return build @@ -171,12 +171,12 @@ class ArtifactBuild(FreshmakerBase): "build_id": self.build_id, } - def get_root_dep_of(self): - dep_of = self.dep_of - while dep_of: - dep = dep_of.dep_of + def get_root_dep_on(self): + dep_on = self.dep_on + while dep_on: + dep = dep_on.dep_on if dep: - dep_of = dep + dep_on = dep else: break - return dep_of + return dep_on diff --git a/tests/test_mbs_module_state_change_handler.py b/tests/test_mbs_module_state_change_handler.py index d893fef..dcf32f1 100644 --- a/tests/test_mbs_module_state_change_handler.py +++ b/tests/test_mbs_module_state_change_handler.py @@ -212,7 +212,7 @@ class MBSModuleStateChangeHandlerTest(helpers.FreshmakerTestCase): handler = MBSModuleStateChangeHandler() # Assume we have build of module1 recorded in DB already, it doesn't has - # any dep_of as it was initial triggered by an event which is not + # any dep_on as it was initial triggered by an event which is not # associated with any build in our DB. event = models.Event.create(db.session, "initial_msg_id", "test", events.TestingEvent) models.ArtifactBuild.create(db.session, event, "module1", "module", '123') diff --git a/tests/test_models.py b/tests/test_models.py index 853a188..0d21ba0 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -55,15 +55,15 @@ class TestModels(unittest.TestCase): self.assertEqual(e.builds[0].type, 2) self.assertEqual(e.builds[0].state, 0) self.assertEqual(e.builds[0].build_id, 1234) - self.assertEqual(e.builds[0].dep_of, None) + self.assertEqual(e.builds[0].dep_on, None) self.assertEqual(e.builds[1].name, "mksh") self.assertEqual(e.builds[1].type, 2) self.assertEqual(e.builds[1].state, 0) self.assertEqual(e.builds[1].build_id, 1235) - self.assertEqual(e.builds[1].dep_of.name, "ed") + self.assertEqual(e.builds[1].dep_on.name, "ed") - def test_get_root_dep_of(self): + def test_get_root_dep_on(self): event = Event.create(db.session, "test_msg_id", "test", events.TestingEvent) build1 = ArtifactBuild.create(db.session, event, "ed", "module", 1234) build2 = ArtifactBuild.create(db.session, event, "mksh", "module", 1235, build1) @@ -71,7 +71,7 @@ class TestModels(unittest.TestCase): build4 = ArtifactBuild.create(db.session, event, "perl-runtime", "module", 1237, build3) db.session.commit() db.session.expire_all() - self.assertEqual(build1.get_root_dep_of(), None) - self.assertEqual(build2.get_root_dep_of(), build1) - self.assertEqual(build3.get_root_dep_of(), build1) - self.assertEqual(build4.get_root_dep_of(), build1) + self.assertEqual(build1.get_root_dep_on(), None) + self.assertEqual(build2.get_root_dep_on(), build1) + self.assertEqual(build3.get_root_dep_on(), build1) + self.assertEqual(build4.get_root_dep_on(), build1)