Move fixtures under test, since they are shared globally

endpoints/api/test/test_security.py

@@ -3,7 +3,7 @@ import pytest
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
 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
+from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 
 TEAM_PARAMS = {'orgname': 'buynlarge', 'teamname': 'owners'}
 BUILD_PARAMS = {'build_uuid': 'test-1234'}

endpoints/oauth/test/test_login.py

@@ -1,12 +1,12 @@
 import pytest
 
 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 data import model, database
 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
 
 

endpoints/test/fixtures.py

@@ -1,90 +0,0 @@
-import os
-
-import pytest
-import shutil
-from flask import Flask, jsonify
-from flask.ext.login import LoginManager
-from peewee import SqliteDatabase
-
-from app import app as application
-from data import model
-from data.database import (close_db_filter, db)
-from data.model.user import LoginWrappedDBUser
-from endpoints.api import api_bp
-from endpoints.web import web
-
-from initdb import initialize_database, populate_database
-from path_converters import APIRepositoryPathConverter, RegexConverter, RepositoryPathConverter
-
-
-@pytest.fixture()
-def app(appconfig):
-  """ Used by pytest-flask plugin to inject app by test for client See test_security by name injection of client. """
-  app = Flask(__name__)
-  login_manager = LoginManager(app)
-
-  @app.errorhandler(model.DataModelException)
-  def handle_dme(ex):
-    response = jsonify({'message': ex.message})
-    response.status_code = 400
-    return response
-
-  @login_manager.user_loader
-  def load_user(user_uuid):
-    return LoginWrappedDBUser(user_uuid)
-
-  app.url_map.converters['regex'] = RegexConverter
-  app.url_map.converters['apirepopath'] = APIRepositoryPathConverter
-  app.url_map.converters['repopath'] = RepositoryPathConverter
-  app.register_blueprint(api_bp, url_prefix='/api')
-  app.register_blueprint(web, url_prefix='/')
-  app.config.update(appconfig)
-  return app
-
-
-@pytest.fixture(scope="session")
-def init_db_path(tmpdir_factory):
-  """ Creates a new db and appropriate configuration. Used for parameter by name injection. """
-  sqlitedb_file = str(tmpdir_factory.mktemp("data").join("test.db"))
-  sqlitedb = 'sqlite:///{0}'.format(sqlitedb_file)
-  conf = {"TESTING": True,
-          "DEBUG": True,
-          "DB_URI": sqlitedb}
-  os.environ['TEST_DATABASE_URI'] = str(sqlitedb)
-  os.environ['DB_URI'] = str(sqlitedb)
-  db.initialize(SqliteDatabase(sqlitedb_file))
-  application.config.update(conf)
-  application.config.update({"DB_URI": sqlitedb})
-  initialize_database()
-  populate_database()
-  close_db_filter(None)
-  return str(sqlitedb_file)
-
-
-@pytest.fixture()
-def database_uri(monkeypatch, init_db_path, sqlitedb_file):
-  """ Creates the db uri. Used for parameter by name injection. """
-  shutil.copy2(init_db_path, sqlitedb_file)
-  db.initialize(SqliteDatabase(sqlitedb_file))
-  db_path = 'sqlite:///{0}'.format(sqlitedb_file)
-  monkeypatch.setenv("DB_URI", db_path)
-  return db_path
-
-
-@pytest.fixture()
-def sqlitedb_file(tmpdir):
-  """ Makes file for db. Used for parameter by name injection. """
-  test_db_file = tmpdir.mkdir("quaydb").join("test.db")
-  return str(test_db_file)
-
-
-@pytest.fixture()
-def appconfig(database_uri):
-  """ Makes conf with database_uri. Used for parameter by name injection """
-  conf = {
-    "TESTING": True,
-    "DEBUG": True,
-    "DB_URI": database_uri,
-    "SECRET_KEY": 'superdupersecret!!!1',
-  }
-  return conf

endpoints/test/test_notificationevent.py

@@ -1,7 +1,7 @@
 import json
 
 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