Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(dp): Retain DB state in orc8r integration tests #12607

Merged
merged 1 commit into from
May 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@ def tearDown(self) -> None:

@classmethod
def setUpClass(cls) -> None:
super().setUpClass()
cls.postgresql = testing.postgresql.PostgresqlFactory(cache_initialized_db=True)()

@classmethod
def tearDownClass(cls) -> None:
cls.postgresql.stop()

def setUp(self) -> None:
self.metadata = sqlalchemy.MetaData()
self.setMetadata(sqlalchemy.MetaData())
self.set_up_db_test_case(SQLALCHEMY_DB_URI=self.postgresql.url())
self.up_revision = self.up_revision or "head"
self.down_revision = self.down_revision or "base"
Expand Down
48 changes: 30 additions & 18 deletions dp/cloud/python/magma/db_service/tests/db_testcase.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,54 @@ class DBTestCaseBlueprint(unittest.TestCase):
engine: sqlalchemy.engine.Engine
session: Session

def drop_all(self):
self.metadata.drop_all()
@classmethod
def drop_all(cls):
cls.metadata.drop_all()

def set_up_db_test_case(self, **kwargs: Optional[Dict]):
self.engine = self.get_test_db_engine(**kwargs)
self.session = Session(bind=self.engine)
self.bind_engine()
@classmethod
def create_all(cls):
cls.metadata.create_all()

@classmethod
def setMetadata(cls, metadata: MetaData = Base.metadata):
cls.metadata = metadata

@classmethod
def setUpClass(cls) -> None:
cls.setMetadata(metadata=Base.metadata)

@classmethod
def set_up_db_test_case(cls, **kwargs: Optional[Dict]):
cls.engine = cls.get_test_db_engine(**kwargs)
cls.session = Session(bind=cls.engine)
cls.bind_engine()

@staticmethod
def get_test_db_engine(**kwargs) -> sqlalchemy.engine.Engine:
config = TestConfig()
return create_engine(
url=kwargs.get("SQLALCHEMY_DB_URI") or config.SQLALCHEMY_DB_URI,
encoding=kwargs.get("SQLALCHEMY_DB_ENCODING") or config.SQLALCHEMY_DB_ENCODING,
url=kwargs.get("SQLALCHEMY_DB_URI", config.SQLALCHEMY_DB_URI),
encoding=kwargs.get("SQLALCHEMY_DB_ENCODING", config.SQLALCHEMY_DB_ENCODING),
echo=False,
future=kwargs.get("SQLALCHEMY_FUTURE") or config.SQLALCHEMY_FUTURE,
future=kwargs.get("SQLALCHEMY_FUTURE", config.SQLALCHEMY_FUTURE),
)

def bind_engine(self):
self.metadata.bind = self.engine
@classmethod
def bind_engine(cls):
cls.metadata.bind = cls.engine

def close_session(self):
self.session.rollback()
self.session.close()
@classmethod
def close_session(cls):
cls.session.rollback()
cls.session.close()


class BaseDBTestCase(DBTestCaseBlueprint):

def setUp(self):
self.metadata = Base.metadata
self.set_up_db_test_case()
self.create_all()

def tearDown(self):
self.close_session()
self.drop_all()

def create_all(self):
self.metadata.create_all()
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ class LocalDBTestCase(BaseDBTestCase):

@classmethod
def setUpClass(cls) -> None:
super().setUpClass()
cls.postgresql = testing.postgresql.PostgresqlFactory(cache_initialized_db=True)()

@classmethod
def tearDownClass(cls) -> None:
cls.postgresql.stop()

def setUp(self):
self.metadata = Base.metadata
self.set_up_db_test_case(SQLALCHEMY_DB_URI=self.postgresql.url())
self.create_all()
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
class ActiveModeControllerTestCase(BaseDBTestCase):
@classmethod
def setUpClass(cls):
super().setUpClass()
wait_for_elastic_to_start()

def setUp(self):
Expand Down