File tree Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -81,6 +81,9 @@ def initialize_sql(self, file_name):
81
81
except IOError as err :
82
82
logger .debug (
83
83
'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
84
87
except Exception as err :
85
88
logger .debug (
86
89
'ERROR trying to initialize database. Error message: %s\n ' , str (err ))
@@ -109,7 +112,7 @@ def upgrade_to_latest(self):
109
112
110
113
while self .sql_schema_version < self .max_level :
111
114
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
113
116
114
117
def upgrade_schema_if_old_version (self ):
115
118
""" check settings table exists """
@@ -291,9 +294,7 @@ def upgrade_config_setting_version(self):
291
294
def error_handler (err , custom_error ):
292
295
if str (err ) == 'database or disk is full' :
293
296
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
297
298
)
298
299
queues .UISignalQueue .put ((
299
300
'alert' , (
Original file line number Diff line number Diff line change @@ -213,12 +213,10 @@ def test_bm_db_version_10(self):
213
213
res = self .test_db .cur .fetchall ()
214
214
self .assertEqual (res [0 ][0 ], label , "Data not migrated for version 10" )
215
215
216
- @version
217
216
def test_bm_db_version_type (self ):
218
217
"""
219
218
Test version type
220
219
"""
221
220
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 )
You can’t perform that action at this time.
0 commit comments