Switch fixture imports to wildcard in prep for full db test fixes

auth/test/test_basic.py

@@ -5,7 +5,8 @@ from base64 import b64encode
 from auth.basic import validate_basic_auth, ACCESS_TOKEN_USERNAME, OAUTH_TOKEN_USERNAME
 from auth.validateresult import AuthKind, ValidateResult
 from data import model
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+
+from test.fixtures import *
 
 def _token(username, password):
   return 'basic ' + b64encode('%s:%s' % (username, password))

auth/test/test_cookie.py

@@ -5,7 +5,7 @@ from flask_login import login_user
 from app import LoginWrappedDBUser
 from data import model
 from auth.cookie import validate_session_cookie
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 def test_anonymous_cookie(app):
   assert validate_session_cookie().missing

auth/test/test_decorators.py

@@ -9,7 +9,7 @@ from auth.auth_context import get_authenticated_user
 from auth.decorators import (extract_namespace_repo_from_session, require_session_login,
                              process_auth_or_cookie)
 from data import model
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 def test_extract_namespace_repo_from_session_missing(app):
   def emptyfunc():

auth/test/test_oauth.py

@@ -3,7 +3,7 @@ import pytest
 from auth.oauth import validate_bearer_auth, validate_oauth_token
 from auth.validateresult import AuthKind, ValidateResult
 from data import model
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 @pytest.mark.parametrize('header, expected_result', [
   ('', ValidateResult(AuthKind.oauth, missing=True)),

auth/test/test_validateresult.py

@@ -4,7 +4,7 @@ from auth.auth_context import (get_authenticated_user, get_grant_context, get_va
                                get_validated_oauth_token)
 from auth.validateresult import AuthKind, ValidateResult
 from data import model
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 
 def get_user():

data/model/test/test_repository.py

@@ -3,9 +3,9 @@ import pytest
 from peewee import IntegrityError
 
 from data.model.repository import create_repository, purge_repository
-from test.fixtures import database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
-def test_duplicate_repository_different_kinds(database_uri):
+def test_duplicate_repository_different_kinds(initialized_db):
   # Create an image repo.
   create_repository('devtable', 'somenewrepo', None, repo_kind='image')
 

data/model/test/test_repositoryactioncount.py

@@ -5,7 +5,7 @@ import pytest
 from data.database import RepositoryActionCount, RepositorySearchScore
 from data.model.repository import create_repository
 from data.model.repositoryactioncount import update_repository_score, SEARCH_BUCKETS
-from test.fixtures import database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 @pytest.mark.parametrize('bucket_sums,expected_score', [
   ((0, 0, 0, 0), 0),
@@ -20,7 +20,7 @@ from test.fixtures import database_uri, init_db_path, sqlitedb_file
   ((300, 500, 1000, 0), 1733),
   ((5000, 0, 0, 0), 5434),
 ])
-def test_update_repository_score(bucket_sums, expected_score, database_uri):
+def test_update_repository_score(bucket_sums, expected_score, initialized_db):
   # Create a new repository.
   repo = create_repository('devtable', 'somenewrepo', None, repo_kind='image')
 

data/model/test/test_tag.py

@@ -1,7 +1,7 @@
 from data.model.repository import create_repository
 from data.model.tag import list_active_repo_tags, create_or_update_tag, delete_tag
 from data.model.image import find_create_or_link_image
-from test.fixtures import database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 def assert_tags(repository, *args):
   tags = list(list_active_repo_tags(repository))
@@ -18,7 +18,7 @@ def assert_tags(repository, *args):
   for expected in args:
     assert expected in tags_dict
 
-def test_list_active_tags(database_uri):
+def test_list_active_tags(initialized_db):
   # Create a new repository.
   repository = create_repository('devtable', 'somenewrepo', None)
 

data/model/test/test_user.py

@@ -1,9 +1,9 @@
 from mock import patch
 
 from data.model.user import create_user_noverify
-from test.fixtures import database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
-def test_create_user_with_expiration(database_uri):
+def test_create_user_with_expiration(initialized_db):
   with patch('data.model.config.app_config', {'DEFAULT_TAG_EXPIRATION': '1h'}):
     user = create_user_noverify('foobar', 'foo@example.com', email_required=False)
     assert user.removed_tag_expiration_s == 60 * 60

data/test/test_userfiles.py

@@ -4,7 +4,7 @@ from mock import Mock
 from io import BytesIO
 
 from data.userfiles import DelegateUserfiles, Userfiles
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 
 @pytest.mark.parametrize('prefix,path,expected', [

data/users/test/test_teamsync.py

@@ -5,11 +5,12 @@ import pytest
 from data import model, database
 from data.users.federated import FederatedUsers, UserInformation
 from data.users.teamsync import sync_team, sync_teams_to_groups
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 from test.test_ldap import mock_ldap
 from test.test_keystone_auth import fake_keystone
 from util.names import parse_robot_username
 
+from test.fixtures import *
+
 _FAKE_AUTH = 'fake'
 
 class FakeUsers(FederatedUsers):

endpoints/api/test/test_disallow_for_apps.py

@@ -17,7 +17,7 @@ from endpoints.api.trigger import (BuildTriggerList, BuildTrigger, BuildTriggerS
                                    TriggerBuildList, BuildTriggerFieldValues, BuildTriggerSources,
                                    BuildTriggerSourceNamespaces)
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 BUILD_ARGS = {'build_uuid': '1234'}
 IMAGE_ARGS = {'imageid': '1234', 'image_id': 1234}

endpoints/api/test/test_disallow_under_trust.py

@@ -8,7 +8,7 @@ from endpoints.api.trigger import (BuildTrigger, BuildTriggerSubdirs,
                                    BuildTriggerFieldValues, BuildTriggerSources,
                                    BuildTriggerSourceNamespaces)
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 BUILD_ARGS = {'build_uuid': '1234'}
 IMAGE_ARGS = {'imageid': '1234', 'image_id': 1234}

endpoints/api/test/test_organization.py

@@ -4,7 +4,7 @@ from data import model
 from endpoints.api import api
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
 from endpoints.api.organization import Organization
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import *
 
 @pytest.mark.parametrize('expiration, expected_code', [
     (0, 200),

endpoints/api/test/test_repository.py

@@ -1,10 +1,12 @@
 import pytest
 
+from mock import patch, ANY, MagicMock
+
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
 from endpoints.api.repository import RepositoryTrust, Repository
 from features import FeatureNameValue
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+
-from mock import patch, ANY, MagicMock
+from test.fixtures import *
 
 
 INVALID_RESPONSE = {

endpoints/api/test/test_security.py

@@ -8,7 +8,8 @@ from endpoints.api.superuser import SuperUserRepositoryBuildLogs, SuperUserRepos
 from endpoints.api.superuser import SuperUserRepositoryBuildStatus
 from endpoints.api.signing import RepositorySignatures
 from endpoints.api.repository import RepositoryTrust
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+
+from test.fixtures import *
 
 TEAM_PARAMS = {'orgname': 'buynlarge', 'teamname': 'owners'}
 BUILD_PARAMS = {'build_uuid': 'test-1234'}

endpoints/api/test/test_signing.py

@@ -1,11 +1,12 @@
-from collections import Counter
-
 import pytest
 
+from collections import Counter
+from mock import patch
+
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
 from endpoints.api.signing import RepositorySignatures
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+
-from mock import patch
+from test.fixtures import *
 
 VALID_TARGETS = {
   'latest': {

endpoints/api/test/test_team.py

@@ -7,9 +7,10 @@ from endpoints.api import api
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
 from endpoints.api.team import OrganizationTeamSyncing, TeamMemberList
 from endpoints.api.organization import Organization
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 from test.test_ldap import mock_ldap
 
+from test.fixtures import *
+
 SYNCED_TEAM_PARAMS = {'orgname': 'sellnsmall', 'teamname': 'synced'}
 UNSYNCED_TEAM_PARAMS = {'orgname': 'sellnsmall', 'teamname': 'owners'}
 

endpoints/appr/test/test_appr_decorators.py

@@ -4,7 +4,8 @@ from werkzeug.exceptions import HTTPException
 
 from data import model
 from endpoints.appr import require_app_repo_read
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+
+from test.fixtures import *
 
 def test_require_app_repo_read(app):
   called = [False]

endpoints/appr/test/test_registry.py

@@ -5,8 +5,8 @@ import pytest
 
 from data import model
 from endpoints.appr.registry import appr_bp
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 
+from test.fixtures import *
 
 @pytest.mark.parametrize('login_data, expected_code', [
   ({

endpoints/oauth/test/test_login.py

@@ -4,9 +4,9 @@ from data import model, database
 from data.users import get_users_handler, DatabaseUsers
 from endpoints.oauth.login import _conduct_oauth_login
 from oauth.services.github import GithubOAuthService
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 from test.test_ldap import mock_ldap
 
+from test.fixtures import *
 
 @pytest.fixture(params=[None, 'username', 'email'])
 def login_service(request, app):

endpoints/test/test_notificationevent.py

@@ -1,10 +1,10 @@
 import json
 
 from endpoints.notificationevent import NotificationEvent
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
-
 from util.morecollections import AttrDict
 
+from test.fixtures import *
+
 def test_all_notifications(app):
   # Create a test notification.
   test_notification = AttrDict({

workers/test/test_repositoryactioncounter.py

@@ -1,7 +1,8 @@
 from data import model, database
-from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 from workers.repositoryactioncounter import RepositoryActionCountWorker
 
+from test.fixtures import *
+
 def test_repositoryactioncount(app):
   database.RepositoryActionCount.delete().execute()
   database.RepositorySearchScore.delete().execute()