No more magic.

Author: shaleh

tests/common_testing.py

@@ -10,8 +10,6 @@
 # no assumption that 'default' is a valid database.
 # For any test that would usually use Django's TestCase or TransactionTestCase using
 # the classes defined here is all that is required.
-# Any test that uses pytest's django_db need to include a databases parameter using
-# test_database_names defined below.
 # In test code, anywhere the database is referenced the Django router needs to be used
 # exactly like the package's code.
 # For instance:
@@ -20,11 +18,19 @@
 # Without the 'using' option, this test fails in the multiple database scenario because
 # 'default' is used.
 
-test_database_names = ["alpha", "beta"] if len(settings.DATABASES) > 1 else ["default"]
+
+def retrieve_current_databases():
+    if len(settings.DATABASES) > 1:
+        return [name for name in settings.DATABASES if name != "default"]
+    else:
+        return ["default"]
 
 
 class OAuth2ProviderBase:
-    databases = test_database_names
+    @classmethod
+    def setUpClass(cls):
+        cls.databases = retrieve_current_databases()
+        super().setUpClass()
 
 
 class OAuth2ProviderTestCase(OAuth2ProviderBase, DjangoTestCase):

tests/test_hybrid.py

@@ -22,7 +22,6 @@
 
 from . import presets
 from .common_testing import OAuth2ProviderTestCase as TestCase
-from .common_testing import test_database_names
 from .utils import get_basic_auth_header, spy_on
 
 
@@ -1320,7 +1319,7 @@ def test_pre_auth_default_scopes(self):
         self.assertEqual(form["client_id"].value(), self.application.client_id)
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_id_token_nonce_in_token_response(oauth2_settings, test_user, hybrid_application, client, oidc_key):
     client.force_login(test_user)
@@ -1369,7 +1368,7 @@ def test_id_token_nonce_in_token_response(oauth2_settings, test_user, hybrid_app
     assert claims["nonce"] == "random_nonce_string"
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_claims_passed_to_code_generation(
     oauth2_settings, test_user, hybrid_application, client, mocker, oidc_key

tests/test_models.py

@@ -20,7 +20,6 @@
 
 from . import presets
 from .common_testing import OAuth2ProviderTestCase as TestCase
-from .common_testing import test_database_names
 
 
 CLEARTEXT_SECRET = "1234567890abcdefghijklmnopqrstuvwxyz"
@@ -467,7 +466,7 @@ def test_clear_expired_tokens_with_tokens(self):
         assert remaining_gt_count == initial_gt_count // 2, "half the remaining grants should still exist."
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_id_token_methods(oidc_tokens, rf):
     id_token = IDToken.objects.get()
@@ -502,7 +501,7 @@ def test_id_token_methods(oidc_tokens, rf):
     assert IDToken.objects.filter(jti=id_token.jti).count() == 0
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_clear_expired_id_tokens(oauth2_settings, oidc_tokens, rf):
     id_token = IDToken.objects.get()
@@ -541,7 +540,7 @@ def test_clear_expired_id_tokens(oauth2_settings, oidc_tokens, rf):
     assert not IDToken.objects.filter(jti=id_token.jti).exists()
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_application_key(oauth2_settings, application):
     # RS256 key
@@ -566,7 +565,7 @@ def test_application_key(oauth2_settings, application):
     assert "This application does not support signed tokens" == str(exc.value)
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_application_clean(oauth2_settings, application):
     # RS256, RSA key is configured
@@ -606,15 +605,15 @@ def test_application_clean(oauth2_settings, application):
     application.clean()
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.ALLOWED_SCHEMES_DEFAULT)
 def test_application_origin_allowed_default_https(oauth2_settings, cors_application):
     """Test that http schemes are not allowed because ALLOWED_SCHEMES allows only https"""
     assert cors_application.origin_allowed("https://example.com")
     assert not cors_application.origin_allowed("http://example.com")
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.ALLOWED_SCHEMES_HTTP)
 def test_application_origin_allowed_http(oauth2_settings, cors_application):
     """Test that http schemes are allowed because http was added to ALLOWED_SCHEMES"""

tests/test_oauth2_validators.py

@@ -17,7 +17,6 @@
 from . import presets
 from .common_testing import OAuth2ProviderTestCase as TestCase
 from .common_testing import OAuth2ProviderTransactionTestCase as TransactionTestCase
-from .common_testing import test_database_names
 from .utils import get_basic_auth_header
 
 
@@ -547,7 +546,7 @@ def test_get_jwt_bearer_token(oauth2_settings, mocker):
     assert mock_get_id_token.call_args[1] == {}
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_validate_id_token_expired_jwt(oauth2_settings, mocker, oidc_tokens):
     mocker.patch("oauth2_provider.oauth2_validators.jwt.JWT", side_effect=jwt.JWTExpired)
@@ -563,7 +562,7 @@ def test_validate_id_token_no_token(oauth2_settings, mocker):
     assert status is False
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_validate_id_token_app_removed(oauth2_settings, mocker, oidc_tokens):
     oidc_tokens.application.delete()
@@ -572,7 +571,7 @@ def test_validate_id_token_app_removed(oauth2_settings, mocker, oidc_tokens):
     assert status is False
 
 
-@pytest.mark.django_db(databases=test_database_names)
+@pytest.mark.django_db
 @pytest.mark.oauth2_settings(presets.OIDC_SETTINGS_RW)
 def test_validate_id_token_bad_token_no_aud(oauth2_settings, mocker, oidc_key):
     token = jwt.JWT(header=json.dumps({"alg": "RS256"}), claims=json.dumps({"bad": "token"}))