Move all audit server tests to top level folder

Moves all tests under orm/services/audit_server to top level tests
folder, making minimal necessary changes to get them working.

Change-Id: Ia1ed4d2db2e0f75b110ba0d2c4f5658930a1b1ad
This commit is contained in:
Nicholas Jones 2017-08-15 12:10:10 -05:00
parent 0979e50eea
commit fa3adb968b
23 changed files with 33 additions and 43 deletions

View File

@ -4,9 +4,9 @@ import base
import logging
import wsme
from audit_server.model.transaction import Model as TransactionModel
from audit_server.model.transaction_query import Model as QueryModel
from audit_server.services import transaction as transaction_service
from orm.services.audit_trail_manager.audit_server.model.transaction import Model as TransactionModel
from orm.services.audit_trail_manager.audit_server.model.transaction_query import Model as QueryModel
from orm.services.audit_trail_manager.audit_server.services import transaction as transaction_service
from pecan import rest
from wsme import types as wtypes
from wsmeext.pecan import wsexpose

View File

@ -2,9 +2,9 @@
import logging
from audit_server.model.transaction_query_result import \
from orm.services.audit_trail_manager.audit_server.model.transaction_query_result import \
Model as QueryResultModel
from audit_server.storage import factory
from orm.services.audit_trail_manager.audit_server.storage import factory
logger = logging.getLogger(__name__)

View File

@ -1,7 +1,7 @@
"""factory module."""
from audit_server.storage.mysql.transaction import Connection as Transaction
from orm.services.audit_trail_manager.audit_server.storage.mysql.transaction import Connection as Transaction
database_url = 'NA'
echo_statements = False

View File

@ -2,8 +2,8 @@
import logging
from audit_server.model.transaction import Model
from audit_server.storage import transaction
from orm.services.audit_trail_manager.audit_server.model.transaction import Model
from orm.services.audit_trail_manager.audit_server.storage import transaction
from sqlalchemy import BigInteger, Column, Integer, Text, asc, create_engine
from sqlalchemy.exc import IntegrityError
from sqlalchemy.ext.declarative.api import declarative_base

View File

@ -1,10 +0,0 @@
"""functional_test module."""
from audit_server.tests.controllers.functional_test import FunctionalTest
class FunctionalTest(FunctionalTest):
"""base functional test class."""
PATH_PREFIX = '/v1'

View File

@ -1,14 +1,14 @@
"""test_transaction module."""
from audit_server.controllers.v1.transaction import QueryResult
from audit_server.model.transaction import Model as TransactionModel
from audit_server.model.transaction_query_result import \
Model as TransactionQueryResultModel
from audit_server.services import transaction as transaction_service
from audit_server.tests.controllers.v1.functional_test import FunctionalTest
from mock import patch
from orm.services.audit_trail_manager.audit_server.controllers.v1.transaction import QueryResult
from orm.services.audit_trail_manager.audit_server.model.transaction import Model as TransactionModel
from orm.services.audit_trail_manager.audit_server.model.transaction_query_result import \
Model as TransactionQueryResultModel
from orm.services.audit_trail_manager.audit_server.services import transaction as transaction_service
from orm.services.audit_trail_manager.audit_server.tests.controllers.v1.functional_test import FunctionalTest
class Test(FunctionalTest):
"""test transaction class."""

View File

@ -3,9 +3,9 @@
import unittest
from audit_server.controllers.v1.base import (ClientSideError,
EntityNotFoundError,
InputValueError)
from orm.services.audit_trail_manager.audit_server.controllers.v1.base import (ClientSideError,
EntityNotFoundError,
InputValueError)
class Test(unittest.TestCase):

View File

@ -3,7 +3,7 @@
import unittest
from audit_server.model.transaction_query_result import \
from orm.services.audit_trail_manager.audit_server.model.transaction_query_result import \
Model as TransactionQueryResultModel

View File

@ -3,7 +3,7 @@
import unittest
from audit_server.services.base import Error
from orm.services.audit_trail_manager.audit_server.services.base import Error
class Test(unittest.TestCase):

View File

@ -1,12 +1,12 @@
"""test_transaction module."""
from mock import patch
import unittest
from audit_server.model.transaction import Model as TransactionModel
from audit_server.model.transaction_query import Model as TransactionQuery
from audit_server.services import transaction as TransactionService
from audit_server.storage import factory
from mock import patch
from orm.services.audit_trail_manager.audit_server.model.transaction import Model as TransactionModel
from orm.services.audit_trail_manager.audit_server.model.transaction_query import Model as TransactionQuery
from orm.services.audit_trail_manager.audit_server.services import transaction as TransactionService
from orm.services.audit_trail_manager.audit_server.storage import factory
class Test(unittest.TestCase):

View File

@ -2,9 +2,9 @@
import unittest
from audit_server.model.transaction import Model as TransactionModel
from audit_server.model.transaction_query import Model as TransactionQueryModel
from audit_server.storage.mysql.transaction import Connection, Record
from orm.services.audit_trail_manager.audit_server.model.transaction import Model as TransactionModel
from orm.services.audit_trail_manager.audit_server.model.transaction_query import Model as TransactionQueryModel
from orm.services.audit_trail_manager.audit_server.storage.mysql.transaction import Connection, Record
from mock import patch
from sqlalchemy import create_engine
from sqlalchemy.exc import IntegrityError

View File

@ -1,11 +1,11 @@
"""test_factory module."""
import unittest
from audit_server.storage import factory
from audit_server.storage.mysql.transaction import Connection
from mock import patch
from sqlalchemy import create_engine
import unittest
from orm.services.audit_trail_manager.audit_server.storage import factory
from orm.services.audit_trail_manager.audit_server.storage.mysql.transaction import Connection
class Test(unittest.TestCase):

View File

@ -3,7 +3,7 @@
import unittest
from audit_server.storage.transaction import Base
from orm.services.audit_trail_manager.audit_server.storage.transaction import Base
class Test(unittest.TestCase):