From 7b386e9d633158267135b9f81affcc208e80e88f Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 9 Feb 2017 11:33:38 -0800 Subject: [PATCH] Move endpoint test fixtures to a non-conftest file --- endpoints/api/test/test_security.py | 2 +- endpoints/{api => }/test/__init__.py | 0 endpoints/{api/test/conftest.py => test/fixtures.py} | 0 endpoints/test/test_oauthlogin.py | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename endpoints/{api => }/test/__init__.py (100%) rename endpoints/{api/test/conftest.py => test/fixtures.py} (100%) diff --git a/endpoints/api/test/test_security.py b/endpoints/api/test/test_security.py index 28441d6bd..21475d529 100644 --- a/endpoints/api/test/test_security.py +++ b/endpoints/api/test/test_security.py @@ -1,11 +1,11 @@ import datetime - import pytest from data import model from endpoints.api import api from endpoints.api.superuser import SuperUserRepositoryBuildLogs, SuperUserRepositoryBuildResource 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): diff --git a/endpoints/api/test/__init__.py b/endpoints/test/__init__.py similarity index 100% rename from endpoints/api/test/__init__.py rename to endpoints/test/__init__.py diff --git a/endpoints/api/test/conftest.py b/endpoints/test/fixtures.py similarity index 100% rename from endpoints/api/test/conftest.py rename to endpoints/test/fixtures.py diff --git a/endpoints/test/test_oauthlogin.py b/endpoints/test/test_oauthlogin.py index 340e33c1a..9cb365f33 100644 --- a/endpoints/test/test_oauthlogin.py +++ b/endpoints/test/test_oauthlogin.py @@ -1,7 +1,7 @@ import pytest 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