diff --git a/backend/run/copr_print_results_to_delete.py b/backend/run/copr_print_results_to_delete.py index 52e1996a6..ed7b57672 100755 --- a/backend/run/copr_print_results_to_delete.py +++ b/backend/run/copr_print_results_to_delete.py @@ -42,14 +42,14 @@ def main(): for chroot in os.listdir(projectpath): if chroot in ["srpm-builds", "modules", "repodata", "pubkey.gpg"]: continue - if not is_outdated_to_be_deleted(get_chroot_safe(client, ownername, projectname, chroot)): + if not is_outdated_to_be_deleted(get_chroot_none_safe(client, ownername, projectname, chroot)): continue print(os.path.join(projectpath, chroot)) except NotADirectoryError as ex: print(str(ex)) -def get_chroot_safe(client, ownername, projectname, chrootname): +def get_chroot_none_safe(client, ownername, projectname, chrootname): try: return client.project_chroot_proxy.get(ownername=ownername, projectname=projectname, chrootname=chrootname) except CoprNoResultException: diff --git a/common/copr_common/worker_manager.py b/common/copr_common/worker_manager.py index 5c53407f8..b207a662d 100644 --- a/common/copr_common/worker_manager.py +++ b/common/copr_common/worker_manager.py @@ -387,7 +387,7 @@ def add_task(self, task): task.priority) self.tasks.add_task(task, task.priority) - def _drop_task_id_safe(self, task_id): + def _drop_task_id_noop_safe(self, task_id): try: self.tasks.remove_task_by_id(task_id) except KeyError: @@ -400,7 +400,7 @@ def cancel_task_id(self, task_id): :return: True if worker is running on background, False otherwise """ - self._drop_task_id_safe(task_id) + self._drop_task_id_noop_safe(task_id) worker_id = self.get_worker_id(task_id) if worker_id not in self.worker_ids(): self.log.info("Cancel request, worker %s is not running", worker_id) diff --git a/dist-git/copr_dist_git/importer.py b/dist-git/copr_dist_git/importer.py index 701e2a767..5a20bf6c1 100644 --- a/dist-git/copr_dist_git/importer.py +++ b/dist-git/copr_dist_git/importer.py @@ -57,7 +57,7 @@ def post_back(self, data_dict): log.debug("Sending back: \n{}".format(json.dumps(data_dict))) return post(self.post_back_url, auth=self.auth, data=json.dumps(data_dict), headers=self.headers) - def post_back_safe(self, data_dict): + def post_back_noop_safe(self, data_dict): """ Ignores any error. """ @@ -98,7 +98,7 @@ def do_import(self, task): shutil.rmtree(workdir) log.info("sending a response for task {}".format(result)) - self.post_back_safe(result) + self.post_back_noop_safe(result) self.teardown_per_task_logging(per_task_log_handler) def setup_per_task_logging(self, task): @@ -120,7 +120,7 @@ def run(self): worker_cls = Worker if self.opts.multiple_threads else SingleThreadWorker self.is_running = True while self.is_running: - pool.terminate_timeouted(callback=self.post_back_safe) + pool.terminate_timeouted(callback=self.post_back_noop_safe) pool.remove_dead() if pool.busy: diff --git a/dist-git/tests/test_importer.py b/dist-git/tests/test_importer.py index 5671282b1..69510d65d 100644 --- a/dist-git/tests/test_importer.py +++ b/dist-git/tests/test_importer.py @@ -94,13 +94,13 @@ def test_post_back(self, mc_post): def test_post_back_safe(self, mc_post): dd = {"foo": "bar"} - self.importer.post_back_safe(dd) + self.importer.post_back_noop_safe(dd) assert mc_post.called mc_post.reset_mock() assert not mc_post.called mc_post.side_effect = IOError - self.importer.post_back_safe(dd) + self.importer.post_back_noop_safe(dd) assert mc_post.called def test_do_import(self, mc_import_package, mc_helpers): @@ -111,7 +111,7 @@ def test_do_import(self, mc_import_package, mc_helpers): reponame='foo', branch_commits={self.BRANCH: '123', self.BRANCH2: '124'} ) - self.importer.post_back_safe = MagicMock() + self.importer.post_back_noop_safe = MagicMock() self.importer.do_import(self.url_task) assert mc_import_package.call_args[0][0] == self.opts @@ -119,7 +119,7 @@ def test_do_import(self, mc_import_package, mc_helpers): assert mc_import_package.call_args[0][2] == self.url_task.branches assert mc_import_package.call_args[0][3] == 'somepath.src.rpm' - self.importer.post_back_safe.assert_has_calls([ + self.importer.post_back_noop_safe.assert_has_calls([ mock.call({ 'build_id': 123, 'pkg_name': 'foo', diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py index a051ade7d..b30ac66a6 100644 --- a/frontend/coprs_frontend/coprs/logic/builds_logic.py +++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py @@ -381,7 +381,7 @@ def get_pending_build_tasks(cls, background=None, data_type=None): return query @classmethod - def get_build_task(cls, task_id): + def get_build_task_safe(cls, task_id): try: build_id, chroot_name = task_id.split("-", 1) except ValueError: @@ -411,7 +411,7 @@ def get_multiple_by_copr(cls, copr): def get_copr_builds_list(cls, copr, dirname=None): query = models.Build.query.filter(models.Build.copr_id==copr.id) if dirname: - copr_dir = coprs_logic.CoprDirsLogic.get_by_copr(copr, dirname) + copr_dir = coprs_logic.CoprDirsLogic.get_by_copr_safe(copr, dirname) query = query.filter(models.Build.copr_dir_id==copr_dir.id) query = query.options(selectinload('build_chroots'), selectinload('package')) return query diff --git a/frontend/coprs_frontend/coprs/logic/complex_logic.py b/frontend/coprs_frontend/coprs/logic/complex_logic.py index 9fbe0b22e..fc26608a7 100644 --- a/frontend/coprs_frontend/coprs/logic/complex_logic.py +++ b/frontend/coprs_frontend/coprs/logic/complex_logic.py @@ -304,7 +304,7 @@ def get_build(build_id): ) from exc @staticmethod - def get_build_chroot(build_id, chrootname): + def get_build_chroot_safe(build_id, chrootname): """ Get a BuildChroot instance based on build ID and name of the chroot. diff --git a/frontend/coprs_frontend/coprs/logic/coprs_logic.py b/frontend/coprs_frontend/coprs/logic/coprs_logic.py index 36133d352..39c8aeb58 100644 --- a/frontend/coprs_frontend/coprs/logic/coprs_logic.py +++ b/frontend/coprs_frontend/coprs/logic/coprs_logic.py @@ -185,7 +185,7 @@ def get_by_ownername(cls, ownername): return cls.filter_by_ownername(query, ownername) @classmethod - def get_by_ownername_coprname(cls, ownername, coprname): + def get_by_ownername_coprname_safe(cls, ownername, coprname): """ Return a Copr object owned by OWNERNAME (either '@groupname' or 'username') with a name COPRNAME. @@ -206,7 +206,7 @@ def get_by_ownername_and_dirname(cls, ownername, dirname): # Some of the calling methods (routes) strictly require us not to check # if the dirname exists. coprname = CoprDirsLogic.copr_name_from_dirname(dirname) - return cls.get_by_ownername_coprname(ownername, coprname) + return cls.get_by_ownername_coprname_safe(ownername, coprname) @classmethod def filter_without_ids(cls, query, ids): @@ -632,7 +632,7 @@ def get_by_copr_or_none(cls, copr, dirname): .filter(models.CoprDir.name==dirname)).first() @classmethod - def get_by_copr(cls, copr, dirname): + def get_by_copr_safe(cls, copr, dirname): """ Return CoprDir instance per given Copr instance and dirname. Raise ObjectNotFound if it doesn't exist. diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py index 868dd9f7d..a7319347e 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py @@ -40,7 +40,7 @@ def build_config(build_chroot): @apiv3_ns.route("/build-chroot//", methods=GET) # deprecated @query_params() def get_build_chroot(build_id, chrootname): - chroot = ComplexLogic.get_build_chroot(build_id, chrootname) + chroot = ComplexLogic.get_build_chroot_safe(build_id, chrootname) return flask.jsonify(to_dict(chroot)) @@ -62,7 +62,7 @@ def get_build_chroot_list(build_id, **kwargs): @apiv3_ns.route("/build-chroot/build-config//", methods=GET) # deprecated @query_params() def get_build_chroot_config(build_id, chrootname): - chroot = ComplexLogic.get_build_chroot(build_id, chrootname) + chroot = ComplexLogic.get_build_chroot_safe(build_id, chrootname) return flask.jsonify(build_config(chroot)) @@ -72,5 +72,5 @@ def get_build_chroot_built_packages(build_id, chrootname): """ Return built packages (NEVRA dicts) for a given build chroot """ - chroot = ComplexLogic.get_build_chroot(build_id, chrootname) + chroot = ComplexLogic.get_build_chroot_safe(build_id, chrootname) return flask.jsonify(chroot.results_dict) diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_builds.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_builds.py index bca1c4601..aa8ec022f 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_builds.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_builds.py @@ -233,7 +233,7 @@ def check_before_build(): # Raises an exception if CoprDir doesn't exist if data["project_dirname"]: - CoprDirsLogic.get_by_copr(copr, data["project_dirname"]) + CoprDirsLogic.get_by_copr_safe(copr, data["project_dirname"]) # Permissions check if not flask.g.user.can_build_in(copr): diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_monitor.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_monitor.py index ed848a692..8a18a5f5f 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_monitor.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_monitor.py @@ -82,7 +82,7 @@ def package_monitor(ownername, projectname, project_dirname=None): additional_fields = set() if project_dirname: - copr_dir = CoprDirsLogic.get_by_copr(copr, project_dirname) + copr_dir = CoprDirsLogic.get_by_copr_safe(copr, project_dirname) else: copr_dir = copr.main_dir diff --git a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py index 018ea57d6..04153ca43 100755 --- a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py +++ b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py @@ -263,7 +263,7 @@ def build_task_canceled(task_id): if not was_running: if '-' in task_id: try: - build_chroot = BuildsLogic.get_build_task(task_id) + build_chroot = BuildsLogic.get_build_task_safe(task_id) build_chroot.status = StatusEnum("canceled") except ObjectNotFound: pass @@ -357,7 +357,7 @@ def _stream(): @backend_ns.route("/get-build-task/") def get_build_task(task_id): try: - task = BuildsLogic.get_build_task(task_id) + task = BuildsLogic.get_build_task_safe(task_id) build_record = get_build_record(task) return flask.jsonify(build_record) except CoprHttpException as ex: