remove test fields, linting fix

ansible · Oct 2, 2024 · 5d30ede · 5d30ede
1 parent 4c260e1
commit 5d30ede
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/awx/conf/migrations/0011_remove_oidc_auth_conf.py b/awx/conf/migrations/0011_remove_oidc_auth_conf.py
@@ -2,12 +2,7 @@
 
 from django.db import migrations
 
-OIDC_AUTH_CONF_KEYS = [
-    'SOCIAL_AUTH_OIDC_KEY',
-    'SOCIAL_AUTH_OIDC_SECRET',
-    'SOCIAL_AUTH_OIDC_OIDC_ENDPOINT',
-    'SOCIAL_AUTH_OIDC_VERIFY_SSL'
-]
+OIDC_AUTH_CONF_KEYS = ['SOCIAL_AUTH_OIDC_KEY', 'SOCIAL_AUTH_OIDC_SECRET', 'SOCIAL_AUTH_OIDC_OIDC_ENDPOINT', 'SOCIAL_AUTH_OIDC_VERIFY_SSL']
 
 
 def remove_oidc_auth_conf(apps, scheme_editor):
@@ -16,7 +11,6 @@ def remove_oidc_auth_conf(apps, scheme_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('conf', '0010_change_to_JSONField'),
     ]

diff --git a/awx/sso/tests/functional/test_common.py b/awx/sso/tests/functional/test_common.py
@@ -304,7 +304,7 @@ def test_get_or_create_org_with_default_galaxy_cred_no_galaxy_cred(self, galaxy_
             (False, True, False, 'social'),
         ],
     )
-    def test_get_external_account(self, enable_ldap, enable_social, enable_enterprise, expected_results):
+    def test_get_external_account(self, enable_ldap, enable_enterprise, expected_results):
         try:
             user = User.objects.get(username="external_tester")
         except User.DoesNotExist:
@@ -332,7 +332,6 @@ def test_get_external_account(self, enable_ldap, enable_social, enable_enterpris
             ('SOCIAL_AUTH_SAML_ENABLED_IDPS', True),
             ('RADIUS_SERVER', True),
             ('TACACSPLUS_HOST', True),
-            # Set some SOCIAL_SOCIAL_AUTH_OIDC_KEYAUTH_*_KEY settings
             ('SOCIAL_AUTH_AZUREAD_OAUTH2_KEY', True),
             ('SOCIAL_AUTH_GITHUB_ENTERPRISE_KEY', True),
             ('SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_KEY', True),
@@ -341,7 +340,6 @@ def test_get_external_account(self, enable_ldap, enable_social, enable_enterpris
             ('SOCIAL_AUTH_GITHUB_ORG_KEY', True),
             ('SOCIAL_AUTH_GITHUB_TEAM_KEY', True),
             ('SOCIAL_AUTH_GOOGLE_OAUTH2_KEY', True),
-            ('SOCIAL_AUTH_OIDC_KEY', True),
             # Try a hypothetical future one
             ('SOCIAL_AUTH_GIBBERISH_KEY', True),
             # Do a SAML one