PROJQUAY-38 - fix test imports

test/fixtures.py

@@ -17,12 +17,10 @@
 
 from app import app as application
 from auth.permissions import on_identity_loaded
-from .data import model
-from .data.database import close_db_filter, db, configure
-from .data.model.user import LoginWrappedDBUser, create_robot, lookup_robot, create_user_noverify
-from .data.model.repository import create_repository
-from .data.model.repo_mirror import enable_mirroring_for_repository
-from .data.userfiles import Userfiles
+from data import model
+from data.database import close_db_filter, db, configure
+from data.model.user import LoginWrappedDBUser, create_robot, lookup_robot, create_user_noverify
+from data.userfiles import Userfiles
 from endpoints.api import api_bp
 from endpoints.appr import appr_bp
 from endpoints.web import web

test/helpers.py

@@ -3,7 +3,7 @@
 import socket
 
 from contextlib import contextmanager
-from .data.database import LogEntryKind, LogEntry3
+from data.database import LogEntryKind, LogEntry3
 
 
 class assert_action_logged(object):

test/queue_threads.py

@@ -6,7 +6,7 @@
 from threading import Thread, Lock
 
 from app import app
-from .data.queue import WorkQueue
+from data.queue import WorkQueue
 from initdb import wipe_database, initialize_database, populate_database
 
 

test/registry_tests.py

@@ -32,8 +32,8 @@
 import endpoints.decorated  # required for side effect
 
 from app import app, storage, instance_keys, get_app_url
-from .data.database import close_db_filter, configure, DerivedStorageForImage, QueueItem, Image
-from .data import model
+from data.database import close_db_filter, configure, DerivedStorageForImage, QueueItem, Image
+from data import model
 from digest.checksums import compute_simple
 from endpoints.api import api_bp
 from endpoints.csrf import generate_csrf_token

test/test_api_usage.py

@@ -32,11 +32,11 @@
 )
 from buildtrigger.basehandler import BuildTriggerHandler
 from initdb import setup_database_for_testing, finished_database_for_testing
-from .data import database, model, appr_model
-from .data.appr_model.models import NEW_MODELS
-from .data.database import RepositoryActionCount, Repository as RepositoryTable
-from .data.logs_model import logs_model
-from .data.registry_model import registry_model
+from data import database, model, appr_model
+from data.appr_model.models import NEW_MODELS
+from data.database import RepositoryActionCount, Repository as RepositoryTable
+from data.logs_model import logs_model
+from data.registry_model import registry_model
 from test.helpers import assert_action_logged
 from util.secscan.fake import fake_security_scanner
 

test/test_endpoints.py

@@ -19,8 +19,8 @@
 from jwkest.jwk import RSAKey
 
 from app import app
-from .data import model
-from .data.database import ServiceKeyApprovalType
+from data import model
+from data.database import ServiceKeyApprovalType
 from endpoints import keyserver
 from endpoints.api import api, api_bp
 from endpoints.api.user import Signin

test/test_external_jwt_authn.py

@@ -12,7 +12,7 @@
 from flask import Flask, jsonify, request, make_response
 
 from app import app
-from .data.users import ExternalJWTAuthN
+from data.users import ExternalJWTAuthN
 from initdb import setup_database_for_testing, finished_database_for_testing
 from test.helpers import liveserver_app
 

test/test_keystone_auth.py

@@ -8,7 +8,7 @@
 from contextlib import contextmanager
 
 from test.helpers import liveserver_app
-from .data.users.keystone import get_keystone_users
+from data.users.keystone import get_keystone_users
 from initdb import setup_database_for_testing, finished_database_for_testing
 
 _PORT_NUMBER = 5001

test/test_ldap.py

@@ -4,8 +4,8 @@
 
 from app import app
 from initdb import setup_database_for_testing, finished_database_for_testing
-from .data.users import LDAPUsers
-from .data import model
+from data.users import LDAPUsers
+from data import model
 from mockldap import MockLdap
 from mock import patch
 from contextlib import contextmanager

test/test_oauth_login.py

@@ -10,7 +10,7 @@
 from jwkest.jwk import RSAKey
 
 from app import app, authentication
-from .data import model
+from data import model
 from endpoints.oauth.login import oauthlogin as oauthlogin_bp
 from test.test_endpoints import EndpointTestCase
 from test.test_ldap import mock_ldap

test/test_secscan.py

@@ -3,8 +3,8 @@
 import unittest
 
 from app import app, storage, notification_queue, url_scheme_and_hostname
-from .data import model
-from .data.database import Image, IMAGE_NOT_SCANNED_ENGINE_VERSION
+from data import model
+from data.database import Image, IMAGE_NOT_SCANNED_ENGINE_VERSION
 from endpoints.v2 import v2_bp
 from initdb import setup_database_for_testing, finished_database_for_testing
 from notifications.notificationevent import VulnerabilityFoundEvent

test/testlogs.py

@@ -6,7 +6,7 @@
 from copy import deepcopy
 from jinja2.utils import generate_lorem_ipsum
 
-from .data.buildlogs import RedisBuildLogs
+from data.buildlogs import RedisBuildLogs
 
 
 logger = logging.getLogger(__name__)
@@ -81,7 +81,7 @@ def advance_script(self, is_get_status):
             (phase, status) = status_wrapper
 
             if not is_get_status:
-                from .data import model
+                from data import model
 
                 build_obj = model.build.get_repository_build(self.test_build_id)
                 build_obj.phase = phase