From 4e180b4cede3df223bbbe5aaa35d3ef9e5bb9541 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Oct 01 2018 16:32:32 +0000 Subject: [PATCH 1/3] repoSpanner fixed this return code to bad request Signed-off-by: Patrick Uiterwijk --- diff --git a/tests/test_pagure_repospanner.py b/tests/test_pagure_repospanner.py index 81b0089..6f50174 100644 --- a/tests/test_pagure_repospanner.py +++ b/tests/test_pagure_repospanner.py @@ -334,7 +334,7 @@ class PagureRepoSpannerTestsNewRepoDefault(PagureRepoSpannerTests): '/clonetest.git/git-upload-pack', headers={'Content-Type': 'application/x-git-upload-pack-request'}, ) - self.assertEqual(output.status_code, 500) + self.assertEqual(output.status_code, 400) output_text = output.get_data(as_text=True) self.assertIn("Error processing your request", output_text) From 917f7a1db72fcf51ec66e284d0cc77b8f0d8c188 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Oct 01 2018 18:06:20 +0000 Subject: [PATCH 2/3] Fix tests for Git 1.x Signed-off-by: Patrick Uiterwijk --- diff --git a/tests/test_pagure_flask_ui_clone.py b/tests/test_pagure_flask_ui_clone.py index b931e0f..d9ed4b1 100644 --- a/tests/test_pagure_flask_ui_clone.py +++ b/tests/test_pagure_flask_ui_clone.py @@ -122,7 +122,6 @@ class PagureFlaskAppClonetests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn("# service=git-upload-pack", output_text) - self.assertIn("symref=HEAD:refs/heads/master", output_text) self.assertIn(" refs/heads/master\n0000", output_text) output = self.app.post( @@ -156,7 +155,6 @@ class PagureFlaskAppClonetests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn("# service=git-upload-pack", output_text) - self.assertIn("symref=HEAD:refs/heads/master", output_text) self.assertIn(" refs/heads/master\n0000", output_text) @patch.dict('pagure.config.config', { From f607efdeb9092559335d76563f9a3fe173c5bdaa Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Oct 01 2018 18:25:11 +0000 Subject: [PATCH 3/3] Allow return 200 for no-request for older Git Signed-off-by: Patrick Uiterwijk --- diff --git a/tests/test_pagure_flask_ui_clone.py b/tests/test_pagure_flask_ui_clone.py index d9ed4b1..66b603c 100644 --- a/tests/test_pagure_flask_ui_clone.py +++ b/tests/test_pagure_flask_ui_clone.py @@ -128,7 +128,9 @@ class PagureFlaskAppClonetests(tests.Modeltests): '/clonetest.git/git-upload-pack', headers={'Content-Type': 'application/x-git-upload-pack-request'}, ) - self.assertEqual(output.status_code, 415) + # Git 2.17 returns 415, older return 200 + # Either means we didn't fully crash when returning the response + self.assertIn(output.status_code, (200, 415)) @patch.dict('pagure.config.config', { 'ALLOW_HTTP_PULL_PUSH': True,