From 2cb264adf50b942bf8c6441fcc5837c5e3bf83e9 Mon Sep 17 00:00:00 2001
From: Waleed Akbar <wakbar@cttc.es>
Date: Tue, 9 Jul 2024 16:47:15 +0000
Subject: [PATCH] Slight changes to verify KPI_DB test
---
.../kpi_manager/database/service/Kpi_DB.py | 16 +++++++---------
.../kpi_manager/database/tests/KpiDBtests.py | 3 +++
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/kpi_management/kpi_manager/database/service/Kpi_DB.py b/src/kpi_management/kpi_manager/database/service/Kpi_DB.py
index 847e4b70a..21027fa7b 100644
--- a/src/kpi_management/kpi_manager/database/service/Kpi_DB.py
+++ b/src/kpi_management/kpi_manager/database/service/Kpi_DB.py
@@ -34,16 +34,14 @@ class Kpi_DB:
# self.create_database(self.db_engine) # to add database
self.Session = sessionmaker(bind=self.db_engine)
- @staticmethod
- def create_database(engine : sqlalchemy.engine.Engine) -> None:
- if not sqlalchemy_utils.database_exists(engine.url):
- LOGGER.info("Database created. {:}".format(engine.url))
- sqlalchemy_utils.create_database(engine.url)
+ def create_database(self) -> None:
+ if not sqlalchemy_utils.database_exists(self.db_engine.url):
+ LOGGER.info("Database created. {:}".format(self.db_engine.url))
+ sqlalchemy_utils.create_database(self.db_engine.url)
- @staticmethod
- def drop_database(engine : sqlalchemy.engine.Engine) -> None:
- if sqlalchemy_utils.database_exists(engine.url):
- sqlalchemy_utils.drop_database(engine.url)
+ def drop_database(self) -> None:
+ if sqlalchemy_utils.database_exists(self.db_engine.url):
+ sqlalchemy_utils.drop_database(self.db_engine.url)
def create_tables(self):
try:
diff --git a/src/kpi_management/kpi_manager/database/tests/KpiDBtests.py b/src/kpi_management/kpi_manager/database/tests/KpiDBtests.py
index 24313e138..402dac8e0 100644
--- a/src/kpi_management/kpi_manager/database/tests/KpiDBtests.py
+++ b/src/kpi_management/kpi_manager/database/tests/KpiDBtests.py
@@ -21,5 +21,8 @@ LOGGER = logging.getLogger(__name__)
def test_verify_Tables():
LOGGER.info('>>> test_verify_Tables : START <<< ')
kpiDBobj = Kpi_DB()
+ kpiDBobj.drop_database()
+ kpiDBobj.verify_tables()
+ kpiDBobj.create_database()
kpiDBobj.create_tables()
kpiDBobj.verify_tables()
--
GitLab