From c3aef66661ae225b22ab06dc6f84b28197f0b853 Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Aug 27 2018 12:51:59 +0000 Subject: Don't fail on displaying releases if UPLOAD_FOLDER_PATH is None --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 40ee3dc..16b90f9 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -1013,9 +1013,10 @@ def view_tags(repo, username=None, namespace=None): repo = flask.g.repo tags = pagure.lib.git.get_git_tags_objects(repo) + upload_folder_path = pagure_config["UPLOAD_FOLDER_PATH"] or "" pagure_checksum = os.path.exists( os.path.join( - pagure_config["UPLOAD_FOLDER_PATH"], repo.fullname, "CHECKSUMS" + upload_folder_path, repo.fullname, "CHECKSUMS" ) ) diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 94c217d..4c16481 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -5958,6 +5958,23 @@ index 0000000..fb7093d 'href="/test/diff/master..master">Open Pull-Request', output_text) + @patch.dict( + 'pagure.config.config', + {'UPLOAD_FOLDER_PATH': None, 'UPLOAD_FOLDER_URL': None}) + def test_releases_upload_folder_vars_None(self): + """ Test that /releases/ page of a repo displays correctly with + UPLOAD_FOLDER_PATH and UPLOAD_FOLDER_URL set to None + """ + tests.create_projects(self.session) + tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) + + output = self.app.get('/test/releases') + self.assertEqual(output.status_code, 200) + self.assertIn( + 'This project has not been tagged.', + output.get_data(as_text=True) + ) + if __name__ == '__main__': unittest.main(verbosity=2)