tests: factorize user fixtures (#20851)

tests/conftest.py

@@ -3,6 +3,7 @@ from httmock import urlmatch, HTTMock, response, remember_called
 
 import django_webtest
 
+from django.contrib.auth.models import User
 from django.core.files import File
 from django.core.cache import cache
 from django.utils import six
@@ -194,3 +195,13 @@ def clear_cache():
         yield
     finally:
         InMemoryCache._cache = {}
+
+
+@pytest.fixture
+def simple_user():
+    return User.objects.create_user('user', password='user')
+
+
+@pytest.fixture
+def admin_user():
+    return User.objects.create_superuser('admin', email=None, password='admin')

tests/test_arcgis.py

@@ -84,11 +84,6 @@ STATES = '''{
 }'''
 
 
-@pytest.fixture
-def admin_user():
-    return User.objects.create_superuser('admin', email=None, password='admin')
-
-
 @pytest.fixture
 def arcgis():
     return ArcGIS.objects.create(slug='test',

tests/test_cmis.py

@@ -22,7 +22,7 @@ import pytest
 from passerelle.base.models import ApiUser, AccessRight
 from passerelle.apps.cmis.models import CmisConnector
 
-from test_manager import login, admin_user
+from test_manager import login
 
 
 def b64encode(content):

tests/test_csv_datasource.py

@@ -40,7 +40,7 @@ from passerelle.base.models import ApiUser, AccessRight
 from passerelle.compat import json_loads
 from passerelle.apps.csvdatasource.models import CsvDataSource, Query, TableRow
 
-from test_manager import login, admin_user
+from test_manager import login
 
 import webtest
 

tests/test_generic_endpoint.py

@@ -39,7 +39,7 @@ from passerelle.apps.mdel.models import MDEL
 from passerelle.contrib.stub_invoices.models import StubInvoicesConnector
 from passerelle.utils.api import endpoint
 
-from test_manager import login, admin_user, simple_user
+from test_manager import login
 
 
 @pytest.fixture

tests/test_manager.py

@@ -4,7 +4,6 @@ import uuid
 
 from webtest import Upload
 
-from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.core.files import File
 from django.utils.six import StringIO
@@ -19,22 +18,6 @@ from passerelle.apps.csvdatasource.models import CsvDataSource, Query
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture
-def simple_user():
-    try:
-        user = User.objects.get(username='user')
-    except User.DoesNotExist:
-        user = User.objects.create_user('user', password='user')
-    return user
-
-@pytest.fixture
-def admin_user():
-    try:
-        user = User.objects.get(username='admin')
-    except User.DoesNotExist:
-        user = User.objects.create_superuser('admin', email=None, password='admin')
-    return user
-
 def login(app, username='admin', password='admin'):
     login_page = app.get('/login/')
     login_form = login_page.forms[0]

tests/test_misc.py

@@ -14,7 +14,7 @@ from passerelle.base.models import ResourceLog
 from passerelle.apps.opengis.models import OpenGIS
 from passerelle.apps.clicrdv.models import ClicRdv
 
-from test_manager import login, admin_user
+from test_manager import login
 
 
 def test_get_description_url_fields(db):

tests/test_opendatasoft.py

@@ -158,11 +158,6 @@ FAKED_CONTENT_ID_SEARCH = json.dumps({
 })
 
 
-@pytest.fixture
-def admin_user():
-    return User.objects.create_superuser('admin', email=None, password='admin')
-
-
 @pytest.fixture
 def connector():
     return utils.setup_access_rights(OpenDataSoft.objects.create(

tests/test_opengis.py

@@ -318,11 +318,6 @@ FAKE_GEOLOCATED_FEATURE_CIRCLE = {
 }
 
 
-@pytest.fixture
-def admin_user():
-    return User.objects.create_superuser('admin', email=None, password='admin')
-
-
 @pytest.fixture
 def connector():
     return utils.setup_access_rights(OpenGIS.objects.create(

tests/test_sms.py

@@ -13,7 +13,7 @@ from passerelle.base.models import ApiUser, AccessRight, Job
 from passerelle.sms.models import SMSResource, SMSLog
 from passerelle.utils.jsonresponse import APIError
 
-from test_manager import login, admin_user
+from test_manager import login
 
 import utils