Move fixtures under test, since they are shared globally

This commit is contained in:
Joseph Schorr 2017-03-14 18:11:06 -04:00
parent 295b09a201
commit abf179eb09
5 changed files with 3 additions and 3 deletions

View file

@ -3,7 +3,7 @@ import pytest
from endpoints.api.test.shared import client_with_identity, conduct_api_call from endpoints.api.test.shared import client_with_identity, conduct_api_call
from endpoints.api.superuser import SuperUserRepositoryBuildLogs, SuperUserRepositoryBuildResource from endpoints.api.superuser import SuperUserRepositoryBuildLogs, SuperUserRepositoryBuildResource
from endpoints.api.superuser import SuperUserRepositoryBuildStatus from endpoints.api.superuser import SuperUserRepositoryBuildStatus
from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
TEAM_PARAMS = {'orgname': 'buynlarge', 'teamname': 'owners'} TEAM_PARAMS = {'orgname': 'buynlarge', 'teamname': 'owners'}
BUILD_PARAMS = {'build_uuid': 'test-1234'} BUILD_PARAMS = {'build_uuid': 'test-1234'}

View file

@ -1,12 +1,12 @@
import pytest import pytest
from endpoints.oauth.login import _conduct_oauth_login from endpoints.oauth.login import _conduct_oauth_login
from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
from oauth.services.github import GithubOAuthService from oauth.services.github import GithubOAuthService
from data import model, database from data import model, database
from data.users import get_users_handler, DatabaseUsers from data.users import get_users_handler, DatabaseUsers
from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
from test.test_ldap import mock_ldap from test.test_ldap import mock_ldap

View file

@ -1,7 +1,7 @@
import json import json
from endpoints.notificationevent import NotificationEvent from endpoints.notificationevent import NotificationEvent
from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
from util.morecollections import AttrDict from util.morecollections import AttrDict