Cleanup test fixtures

This commit is contained in:
Joseph Schorr 2017-02-23 13:48:06 -05:00
parent df603462b8
commit 47278cc559
4 changed files with 8 additions and 12 deletions

View file

@ -1,15 +1,13 @@
import pytest
from datetime import timedelta from datetime import timedelta
from mock import patch
import pytest
from data import model, database from data import model, database
from data.users.federated import FederatedUsers, UserInformation from data.users.federated import FederatedUsers, UserInformation
from data.users.teamsync import sync_team, sync_teams_to_groups from data.users.teamsync import sync_team, sync_teams_to_groups
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.names import parse_robot_username
from test.test_ldap import mock_ldap from test.test_ldap import mock_ldap
from util.names import parse_robot_username
_FAKE_AUTH = 'fake' _FAKE_AUTH = 'fake'

View file

@ -5,7 +5,7 @@ from endpoints.api.team import OrganizationTeamSyncing
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

@ -7,7 +7,7 @@ from endpoints.api import api
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.team import OrganizationTeamSyncing, TeamMemberList from endpoints.api.team import OrganizationTeamSyncing, TeamMemberList
from endpoints.api.organization import Organization from endpoints.api.organization import Organization
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 test.test_ldap import mock_ldap from test.test_ldap import mock_ldap
SYNCED_TEAM_PARAMS = {'orgname': 'sellnsmall', 'teamname': 'synced'} SYNCED_TEAM_PARAMS = {'orgname': 'sellnsmall', 'teamname': 'synced'}

View file

@ -1,11 +1,9 @@
import pytest import pytest
from endpoints.oauth.login import _conduct_oauth_login
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 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.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