diff --git a/openedx/core/djangoapps/user_authn/views/login.py b/openedx/core/djangoapps/user_authn/views/login.py index 266dec73b7..4a7d88f830 100644 --- a/openedx/core/djangoapps/user_authn/views/login.py +++ b/openedx/core/djangoapps/user_authn/views/login.py @@ -421,7 +421,7 @@ def _check_user_auth_flow(site, user): # we don't record their e-mail in case there is sensitive info accidentally # in there. set_custom_attribute("login_tpa_domain_shortcircuit_user_id", user.id) - log.warning("User %s has nonstandard e-mail. Shortcircuiting THIRD_PART_AUTH_ONLY_DOMAIN check.", user.id) + log.warning("User %s has nonstandard e-mail. Shortcircuiting THIRD_PARTY_AUTH_ONLY_DOMAIN check.", user.id) return user_domain = email_parts[1].strip().lower() diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_login.py b/openedx/core/djangoapps/user_authn/views/tests/test_login.py index 38649bb93a..7509bbff95 100644 --- a/openedx/core/djangoapps/user_authn/views/tests/test_login.py +++ b/openedx/core/djangoapps/user_authn/views/tests/test_login.py @@ -1027,8 +1027,7 @@ class LoginTest(SiteMixin, CacheIsolationTestCase, OpenEdxEventsTestMixin): with self.assertLogs(level='WARN') as log: _check_user_auth_flow(site, invalid_email_user) - assert len(log.output) == 1 - assert "Shortcircuiting THIRD_PART_AUTH_ONLY_DOMAIN check." in log.output[0] + assert any("Shortcircuiting THIRD_PARTY_AUTH_ONLY_DOMAIN check." in warning for warning in log.output) @ddt.ddt diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 91edaf839f..634965262d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -431,7 +431,7 @@ edx-django-release-util==1.5.0 # edxval edx-django-sites-extensions==5.1.0 # via -r requirements/edx/kernel.in -edx-django-utils==7.4.0 +edx-django-utils==8.0.0 # via # -r requirements/edx/kernel.in # django-config-models @@ -756,8 +756,6 @@ mysqlclient==2.2.7 # via # -r requirements/edx/kernel.in # openedx-forum -newrelic==10.12.0 - # via edx-django-utils nh3==0.2.21 # via -r requirements/edx/kernel.in nltk==3.9.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 66eb5550b5..94779e2be6 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -705,7 +705,7 @@ edx-django-sites-extensions==5.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-django-utils==7.4.0 +edx-django-utils==8.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1286,11 +1286,6 @@ mysqlclient==2.2.7 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-forum -newrelic==10.12.0 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # edx-django-utils nh3==0.2.21 # via # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 0c05cf6766..2c2b385011 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -515,7 +515,7 @@ edx-django-release-util==1.5.0 # edxval edx-django-sites-extensions==5.1.0 # via -r requirements/edx/base.txt -edx-django-utils==7.4.0 +edx-django-utils==8.0.0 # via # -r requirements/edx/base.txt # django-config-models @@ -920,10 +920,6 @@ mysqlclient==2.2.7 # via # -r requirements/edx/base.txt # openedx-forum -newrelic==10.12.0 - # via - # -r requirements/edx/base.txt - # edx-django-utils nh3==0.2.21 # via -r requirements/edx/base.txt nltk==3.9.1 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 9126643bae..be272a2fc1 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -540,7 +540,7 @@ edx-django-release-util==1.5.0 # edxval edx-django-sites-extensions==5.1.0 # via -r requirements/edx/base.txt -edx-django-utils==7.4.0 +edx-django-utils==8.0.0 # via # -r requirements/edx/base.txt # django-config-models @@ -979,10 +979,6 @@ mysqlclient==2.2.7 # via # -r requirements/edx/base.txt # openedx-forum -newrelic==10.12.0 - # via - # -r requirements/edx/base.txt - # edx-django-utils nh3==0.2.21 # via -r requirements/edx/base.txt nltk==3.9.1