From 0d3655c2a86803a3d479d6ff97c0b343903ec8b3 Mon Sep 17 00:00:00 2001 From: sarah256 Date: Tue, 11 Jun 2019 15:08:47 -0400 Subject: [PATCH] Invalid scmurl on import should yield status 400 --- module_build_service/views.py | 2 +- tests/test_views/test_views.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module_build_service/views.py b/module_build_service/views.py index a40f7d26..86ad995e 100644 --- a/module_build_service/views.py +++ b/module_build_service/views.py @@ -397,7 +397,7 @@ class SCMHandler(BaseHandler): if not get_scm_url_re().match(url): log.error("The submitted scmurl %r is not valid" % url) - raise Forbidden("The submitted scmurl %s is not valid" % url) + raise ValidationError("The submitted scmurl %s is not valid" % url) if not skip_branch and "branch" not in self.data: log.error("Missing branch") diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py index d20eee0a..02b29fa3 100644 --- a/tests/test_views/test_views.py +++ b/tests/test_views/test_views.py @@ -1155,8 +1155,8 @@ class TestViews: "The submitted scmurl https://src.stg.fedoraproject.org" "/modules/testmodule.git is not valid" ) - assert data["status"] == 403 - assert data["error"] == "Forbidden" + assert data["status"] == 400 + assert data["error"] == "Bad Request" @patch("module_build_service.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @@ -1299,8 +1299,8 @@ class TestViews: "The submitted scmurl {} is not allowed".format(scmurl), "The submitted scmurl {} is not valid".format(scmurl), ) - assert data["status"] == 403 - assert data["error"] == "Forbidden" + assert data["status"] in (400, 403) + assert data["error"] in ("Bad Request", "Forbidden") @patch("module_build_service.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM")