From 711898aa46e78dffa4734fd0ea41af2a709043f4 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 22 Nov 2014 22:15:27 +0800 Subject: [PATCH] Add failed database to unit tests tear down function Fix purging of database files in tear down function during unit tests --- CHANGES.md | 2 ++ tests/test_lib.py | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fa22f801..3f7b34d8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -45,6 +45,8 @@ * Change case of labels in General Config/Interface/Timezone * Split enabled from not enabled providers in the Configure Provider drop down on the Providers Options tab * Fix searches freezing due to unescaped ignored or required words +* Add failed database to unit tests tear down function +* Fix purging of database files in tear down function during unit tests [develop changelog] * Fix typo for commit "ShowData handler" i.e. SHA-1:3eec217 diff --git a/tests/test_lib.py b/tests/test_lib.py index 43d87eaa..ba2139e0 100644 --- a/tests/test_lib.py +++ b/tests/test_lib.py @@ -34,7 +34,7 @@ import shutil from sickbeard import encodingKludge as ek, providers, tvcache from sickbeard import db from sickbeard.databases import mainDB -from sickbeard.databases import cache_db +from sickbeard.databases import cache_db, failed_db #================= # test globals @@ -42,7 +42,7 @@ from sickbeard.databases import cache_db TESTDIR = os.path.abspath('.') TESTDBNAME = "sickbeard.db" TESTCACHEDBNAME = "cache.db" - +TESTFAILEDDBNAME = "failed.db" SHOWNAME = u"show name" SEASON = 4 @@ -102,6 +102,7 @@ createTestCacheFolder() #================= def _dummy_saveConfig(): return True + # this overrides the sickbeard save_config which gets called during a db upgrade # this might be considered a hack mainDB.sickbeard.save_config = _dummy_saveConfig @@ -165,7 +166,6 @@ class TestCacheDBConnection(TestDBConnection, object): sickbeard.db.DBConnection = TestDBConnection sickbeard.tvcache.CacheDBConnection = TestCacheDBConnection - #================= # test functions #================= @@ -174,23 +174,29 @@ def setUp_test_db(): """ # upgrading the db db.upgradeDatabase(db.DBConnection(), mainDB.InitialSchema) + # fix up any db problems db.sanityCheckDatabase(db.DBConnection(), mainDB.MainSanityCheck) - #and for cache.b too + # and for cachedb too db.upgradeDatabase(db.DBConnection("cache.db"), cache_db.InitialSchema) + # and for faileddb too + db.upgradeDatabase(db.DBConnection("failed.db"), failed_db.InitialSchema) + def tearDown_test_db(): """Deletes the test db although this seams not to work on my system it leaves me with an zero kb file """ # uncomment next line so leave the db intact between test and at the end - return False + #return False if os.path.exists(os.path.join(TESTDIR, TESTDBNAME)): os.remove(os.path.join(TESTDIR, TESTDBNAME)) if os.path.exists(os.path.join(TESTDIR, TESTCACHEDBNAME)): os.remove(os.path.join(TESTDIR, TESTCACHEDBNAME)) + if os.path.exists(os.path.join(TESTDIR, TESTFAILEDDBNAME)): + os.remove(os.path.join(TESTDIR, TESTFAILEDDBNAME)) def setUp_test_episode_file():