Skip to content

Commit 72f024f

Browse files
committed
Refactor sqlthread and test
1 parent 06886ed commit 72f024f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/class_sqlThread.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ def initialize_sql(self, file_name):
8181
except IOError as err:
8282
logger.debug(
8383
'ERROR trying to initialize database. Error message: %s\n', str(err))
84+
except OSError as err:
85+
logger.debug('The file is missing. Error message: %s\n', str(err))
86+
return
8487
except Exception as err:
8588
logger.debug(
8689
'ERROR trying to initialize database. Error message: %s\n', str(err))
@@ -109,7 +112,7 @@ def upgrade_to_latest(self):
109112

110113
while self.sql_schema_version < self.max_level:
111114
self._upgrade_one_level_sql_statement(self.sql_schema_version)
112-
self.sql_schema_version = True
115+
self.sql_schema_version = True # bump sql_schema_version by one
113116

114117
def upgrade_schema_if_old_version(self):
115118
""" check settings table exists """
@@ -291,9 +294,7 @@ def upgrade_config_setting_version(self):
291294
def error_handler(err, custom_error):
292295
if str(err) == 'database or disk is full':
293296
logger.fatal(
294-
"(While {}) Alert: Your disk or data storage volume is full. sqlThread will now exit.".format(
295-
custom_error
296-
)
297+
"(While %s) Alert: Your disk or data storage volume is full. sqlThread will now exit.", custom_error
297298
)
298299
queues.UISignalQueue.put((
299300
'alert', (

src/tests/test_sqlthread.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,10 @@ def test_bm_db_version_10(self):
213213
res = self.test_db.cur.fetchall()
214214
self.assertEqual(res[0][0], label, "Data not migrated for version 10")
215215

216-
@version
217216
def test_bm_db_version_type(self):
218217
"""
219218
Test version type
220219
"""
221220
self.test_db.cur.execute('''INSERT INTO settings VALUES('version','test_string')''') # noqa
222-
version = self.test_db.cur.execute("SELECT * FROM settings WHERE key='version'")
223-
res = version.fetchall()
224-
self.assertEqual(type(res[0][1]), int)
221+
res = self.test_db.sql_schema_version
222+
self.assertEqual(type(res), int)

0 commit comments

Comments
 (0)