Move endpoint test fixtures to a non-conftest file

This commit is contained in:
Joseph Schorr 2017-02-09 11:33:38 -08:00
parent 2c35383724
commit 7b386e9d63
4 changed files with 2 additions and 2 deletions

View file

@ -1,11 +1,11 @@
import datetime import datetime
import pytest import pytest
from data import model from data import model
from endpoints.api import api from endpoints.api import api
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
def client_with_identity(auth_username, client): def client_with_identity(auth_username, client):

View file

@ -1,7 +1,7 @@
import pytest import pytest
from endpoints.oauthlogin import _conduct_oauth_login from endpoints.oauthlogin import _conduct_oauth_login
from endpoints.api.test.conftest import app, appconfig, database_uri, init_db_path, sqlitedb_file 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