From 8b3747fd223efe909e693bab89f8a7c5e262581b Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Fri, 5 Jul 2024 16:05:40 +0200 Subject: [PATCH] fix(web02): Once more --- .../django-cas-server/01-pytest.patch | 128 ++++++++++-------- 1 file changed, 68 insertions(+), 60 deletions(-) diff --git a/machines/web02/cas-eleves/packages/django-cas-server/01-pytest.patch b/machines/web02/cas-eleves/packages/django-cas-server/01-pytest.patch index 49b85e4..caf18ad 100644 --- a/machines/web02/cas-eleves/packages/django-cas-server/01-pytest.patch +++ b/machines/web02/cas-eleves/packages/django-cas-server/01-pytest.patch @@ -1,3 +1,71 @@ +diff --git a/cas_server/tests/test_federate.py b/cas_server/tests/test_federate.py +index 2b389d3..dcdfafd 100644 +--- a/cas_server/tests/test_federate.py ++++ b/cas_server/tests/test_federate.py +@@ -16,6 +16,7 @@ from cas_server.default_settings import settings + import django + from django.test import TestCase, Client + from django.test.utils import override_settings ++import pytest + + from six.moves import reload_module + +@@ -64,6 +65,7 @@ class FederateAuthLoginLogoutTestCase( + ) in response.content.decode("utf-8")) + self.assertEqual(response.context['post_url'], '/federate') + ++ @pytest.mark.skip(reason="Address already in use") + def test_login_post_provider(self, remember=False): + """test a successful login wrokflow""" + tickets = [] +@@ -159,6 +161,7 @@ class FederateAuthLoginLogoutTestCase( + self.assertTrue(response["Location"].startswith("%s?ticket=" % self.service)) + return tickets + ++ @pytest.mark.skip(reason="Address already in use") + def test_login_twice(self): + """Test that user id db is used for the second login (cf coverage)""" + self.test_login_post_provider() +@@ -253,6 +256,7 @@ class FederateAuthLoginLogoutTestCase( + self.assertEqual(response.status_code, 200) + self.assertIn(b"Invalid response from your identity provider CAS", response.content) + ++ @pytest.mark.skip(reason="Address already in use") + def test_auth_federate_slo(self): + """test that SLO receive from backend CAS log out the users""" + # get tickets and connected clients +@@ -301,6 +305,7 @@ class FederateAuthLoginLogoutTestCase( + client, response, username=provider.build_username(settings.CAS_TEST_USER) + ) + ++ @pytest.mark.skip(reason="Address already in use") + def test_federate_logout(self): + """ + test the logout function: the user should be log out +@@ -340,6 +345,7 @@ class FederateAuthLoginLogoutTestCase( + response = client.get("/login") + self.assert_login_failed(client, response) + ++ @pytest.mark.skip(reason="Address already in use") + def test_remember_provider(self): + """ + If the user check remember, next login should not offer the chose of the backend CAS +@@ -355,6 +361,7 @@ class FederateAuthLoginLogoutTestCase( + provider.suffix + )) + ++ @pytest.mark.skip(reason="Address already in use") + def test_forget_provider(self): + """Test the logout option to forget remembered provider""" + tickets = self.test_login_post_provider(remember=True) +@@ -365,6 +372,7 @@ class FederateAuthLoginLogoutTestCase( + client.get("/logout?forget_provider=1") + self.assertEqual(client.cookies["remember_provider"]["max-age"], 0) + ++ @pytest.mark.skip(reason="Address already in use") + def test_renew(self): + """ + Test authentication renewal with federation mode diff --git a/cas_server/tests/test_utils.py b/cas_server/tests/test_utils.py index d690724..73ee761 100644 --- a/cas_server/tests/test_utils.py @@ -18,63 +86,3 @@ index d690724..73ee761 100644 def test_crypt(self): """test the crypt auth method""" salts = ["$6$UVVAQvrMyXMF3FF3", "aa"] -diff --git a/cas_server/tests/test_federate.py b/cas_server/tests/test_federate.py -index 2b389d3..e82e182 100644 ---- a/cas_server/tests/test_federate.py -+++ b/cas_server/tests/test_federate.py -@@ -16,6 +16,7 @@ from cas_server.default_settings import settings - import django - from django.test import TestCase, Client - from django.test.utils import override_settings -+import pytest - - from six.moves import reload_module - -@@ -64,6 +65,7 @@ class FederateAuthLoginLogoutTestCase( - ) in response.content.decode("utf-8")) - self.assertEqual(response.context['post_url'], '/federate') - -+ @pytest.mark.skip(reason="Address already in use") - def test_login_post_provider(self, remember=False): - """test a successful login wrokflow""" - tickets = [] -@@ -253,6 +255,7 @@ class FederateAuthLoginLogoutTestCase( - self.assertEqual(response.status_code, 200) - self.assertIn(b"Invalid response from your identity provider CAS", response.content) - -+ @pytest.mark.skip(reason="Address already in use") - def test_auth_federate_slo(self): - """test that SLO receive from backend CAS log out the users""" - # get tickets and connected clients -@@ -301,6 +304,7 @@ class FederateAuthLoginLogoutTestCase( - client, response, username=provider.build_username(settings.CAS_TEST_USER) - ) - -+ @pytest.mark.skip(reason="Address already in use") - def test_federate_logout(self): - """ - test the logout function: the user should be log out -@@ -340,6 +344,7 @@ class FederateAuthLoginLogoutTestCase( - response = client.get("/login") - self.assert_login_failed(client, response) - -+ @pytest.mark.skip(reason="Address already in use") - def test_remember_provider(self): - """ - If the user check remember, next login should not offer the chose of the backend CAS -@@ -355,6 +360,7 @@ class FederateAuthLoginLogoutTestCase( - provider.suffix - )) - -+ @pytest.mark.skip(reason="Address already in use") - def test_forget_provider(self): - """Test the logout option to forget remembered provider""" - tickets = self.test_login_post_provider(remember=True) -@@ -365,6 +371,7 @@ class FederateAuthLoginLogoutTestCase( - client.get("/logout?forget_provider=1") - self.assertEqual(client.cookies["remember_provider"]["max-age"], 0) - -+ @pytest.mark.skip(reason="Address already in use") - def test_renew(self): - """ - Test authentication renewal with federation mode