PR#1842: frontend: drop temporary directory upon source failure - copr/copr

copr / copr

#1842 frontend: drop temporary directory upon source failure

Merged 4 years ago by praiskup. Opened 4 years ago by praiskup.

Unknown source drop-temporary-directory-on-failure into main

frontend: drop temporary directory upon source failure

Pavel Raiskup • 4 years ago

6fa973f

.pylintpath/pylint_copr_plugin.py

file modified

+1 -1

		`@@ -22,7 +22,7 @@`
		`Transformate some function definitions so pylint doesn't object.`
		`"""`
		`if function.name == 'logger':`
		`- for prop in ['debug', 'info', 'warning', 'error']:`
		`+ for prop in ['debug', 'info', 'warning', 'error', 'exception']:`
		`function.instance_attrs[prop] = extract_node('def {name}(arg): return'.format(name=prop))`

		`if function.name in ["upgrade", "downgrade"]:`

frontend/coprs_frontend/coprs/logic/builds_logic.py

file modified

+3 -2

		`@@ -857,8 +857,8 @@`
		`storage_path = app.config["STORAGE_DIR"]`
		`try:`
		`shutil.rmtree(os.path.join(storage_path, tmp))`
		`- except:`
		`- pass`
		`+ except OSError:`
		`+ log.exception("Can't remove tmpdir '%s'", tmp)`


		`@classmethod`
		`@@ -947,6 +947,7 @@`

		`if new_status == StatusEnum("failed"):`
		`build.fail_type = FailTypeEnum("srpm_build_error")`
		`+ BuildsLogic.delete_local_source(build)`

		`cls.process_update_callback(build)`
		`db.session.add(build)`

frontend/coprs_frontend/tests/test_logic/test_builds_logic.py

file modified

+66

		`@@ -1,6 +1,7 @@`
		`# -- encoding: utf-8 --`

		`import json`
		`+ import os`
		`import time`

		`import pytest`
		`@@ -520,6 +521,71 @@`
		`assert build.source_status == StatusEnum("importing")`
		`assert build.package.name == "foo"`

		`+ @TransactionDecorator("u1")`
		`+ @pytest.mark.usefixtures("f_users", "f_users_api", "f_mock_chroots", "f_db")`
		`+ @pytest.mark.parametrize("fail", [False, True])`
		`+ def test_temporary_data_removed(self, fail):`
		`+ self.web_ui.new_project("test", ["fedora-rawhide-i386"])`
		`+ content = "content"`
		`+ filename = "fake.src.rpm"`
		`+ def f_uploader(file_path):`
		`+ assert file_path.endswith(filename)`
		`+ with open(file_path, "w") as fd:`
		`+ fd.write(content)`
		`+`
		`+ user = models.User.query.get(1)`
		`+ copr = models.Copr.query.first()`
		`+ build = BuildsLogic.create_new_from_upload(`
		`+ user, copr, f_uploader, os.path.basename(filename),`
		`+ chroot_names=["fedora-18-x86_64"],`
		`+ copr_dirname=None)`
		`+`
		`+ source_dict = build.source_json_dict`
		`+ storage = os.path.join(self.app.config["STORAGE_DIR"], source_dict["tmp"])`
		`+ with open(os.path.join(storage, filename), "r") as fd:`
		`+ assert fd.readlines() == [content]`
		`+ self.db.session.commit()`
		`+ assert os.path.exists(storage)`
		`+`
		`+ form_data = {`
		`+ "builds": [{`
		`+ "id": 1,`
		`+ "task_id": "1",`
		`+ "srpm_url": "http://foo",`
		`+ "status": 0 if fail else 1,`
		`+ "pkg_name": "foo", # not a 'copr-cli'!`
		`+ "pkg_version": 1`
		`+ }],`
		`+ }`
		`+`
		`+ self.backend.update(form_data)`
		`+ build = models.Build.query.get(1)`
		`+ assert build.source_state == "failed" if fail else "importing"`
		`+`
		`+ # Removed upon failure, otherwise exists!`
		`+ assert os.path.exists(storage) is not fail`
		`+`
		`+ if fail:`
		`+ # nothing is imported in this case, nothing to test`
		`+ return`
		`+`
		`+ # test that import hook works`
		`+ r = self.tc.post("/backend/import-completed/",`
		`+ content_type="application/json",`
		`+ headers=self.auth_header,`
		`+ data=json.dumps({`
		`+ "build_id": 1,`
		`+ "branch_commits": {`
		`+ "master": "4dc32823233c0ef1aacc6f345b674d4f40a026b8"`
		`+ },`
		`+ "reponame": "test/foo"`
		`+ }))`
		`+ assert r.status_code == 200`
		`+ build = models.Build.query.get(1)`
		`+ assert build.source_state == "succeeded"`
		`+ assert not os.path.exists(storage)`
		`+`
		`+`
		`@pytest.mark.usefixtures("f_users", "f_coprs", "f_mock_chroots", "f_builds", "f_db")`
		`def test_build_results_filter(self):`
		`"""`