diff --git a/tests/test_logging.py b/tests/test_logging.py index 6c0c8ed..9630bc8 100644 --- a/tests/test_logging.py +++ b/tests/test_logging.py @@ -51,11 +51,11 @@ class LoggingTestCase(utils.TestCase): self.assertEquals(logfile, logging.getLogger('WakaTime').handlers[0].baseFilename) output = [u(' ').join(x) for x in logs.actual()] expected = u('WakaTime WARNING Regex error (unbalanced parenthesis) for include pattern: \\(invalid regex)') - if self.isPy35: + if self.isPy35OrNewer: expected = u('WakaTime WARNING Regex error (unbalanced parenthesis at position 15) for include pattern: \\(invalid regex)') self.assertEquals(output[0], expected) expected = u('WakaTime WARNING Regex error (unbalanced parenthesis) for exclude pattern: \\(invalid regex)') - if self.isPy35: + if self.isPy35OrNewer: expected = u('WakaTime WARNING Regex error (unbalanced parenthesis at position 15) for exclude pattern: \\(invalid regex)') self.assertEquals(output[1], expected) @@ -144,11 +144,11 @@ class LoggingTestCase(utils.TestCase): self.assertEquals(logfile, logging.getLogger('WakaTime').handlers[0].baseFilename) output = [u(' ').join(x) for x in logs.actual()] expected = u('WakaTime WARNING Regex error (unbalanced parenthesis) for include pattern: \\(invalid regex)') - if self.isPy35: + if self.isPy35OrNewer: expected = u('WakaTime WARNING Regex error (unbalanced parenthesis at position 15) for include pattern: \\(invalid regex)') self.assertEquals(output[0], expected) expected = u('WakaTime WARNING Regex error (unbalanced parenthesis) for exclude pattern: \\(invalid regex)') - if self.isPy35: + if self.isPy35OrNewer: expected = u('WakaTime WARNING Regex error (unbalanced parenthesis at position 15) for exclude pattern: \\(invalid regex)') self.assertEquals(output[1], expected) self.assertEquals(output[2], u('WakaTime DEBUG Sending heartbeat to api at https://api.wakatime.com/api/v1/heartbeats')) diff --git a/tests/test_main.py b/tests/test_main.py index 6362647..e558d10 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -539,8 +539,10 @@ class MainTestCase(utils.TestCase): self.assertEquals(sys.stderr.getvalue(), '') log_output = u("\n").join([u(' ').join(x) for x in logs.actual()]) - expected = 'WakaTime WARNING Regex error' - self.assertIn(expected, log_output) + expected = u('WakaTime WARNING Regex error (unexpected end of regular expression) for projectmap pattern: invalid(regex') + if self.isPy35OrNewer: + expected = 'WakaTime WARNING Regex error (missing ), unterminated subpattern at position 7) for include pattern: invalid(regex' + self.assertEquals(expected, log_output) self.patched['wakatime.session_cache.SessionCache.get'].assert_called_once_with() self.patched['wakatime.session_cache.SessionCache.delete'].assert_called_once_with() diff --git a/tests/test_project.py b/tests/test_project.py index 1f86cd3..217b7a2 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -396,7 +396,7 @@ class ProjectTestCase(utils.TestCase): output = [u(' ').join(x) for x in logs.actual()] expected = u('WakaTime WARNING Regex error (unexpected end of regular expression) for projectmap pattern: invalid[({regex') - if self.isPy35: + if self.isPy35OrNewer: expected = u('WakaTime WARNING Regex error (unterminated character set at position 7) for projectmap pattern: invalid[({regex') self.assertEquals(output[0], expected) diff --git a/tests/utils.py b/tests/utils.py index 8263139..8dc92f9 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -50,8 +50,10 @@ class TestCase(unittest.TestCase): self.assertEquals(self.normalize_list(first_list), self.normalize_list(second_list)) @property - def isPy35(self): - return (sys.version_info[0] == 3 and sys.version_info[1] == 5) + def isPy35OrNewer(self): + if sys.version_info[0] > 3: + return True + return (sys.version_info[0] >= 3 and sys.version_info[1] >= 5) try: diff --git a/wakatime/offlinequeue.py b/wakatime/offlinequeue.py index dddc0f2..bbeb97c 100644 --- a/wakatime/offlinequeue.py +++ b/wakatime/offlinequeue.py @@ -34,7 +34,7 @@ class Queue(object): return self.db_file def connect(self): - conn = sqlite3.connect(self.get_db_file()) + conn = sqlite3.connect(self.get_db_file(), isolation_level=None) c = conn.cursor() c.execute('''CREATE TABLE IF NOT EXISTS {0} ( entity text, diff --git a/wakatime/session_cache.py b/wakatime/session_cache.py index a958825..686af88 100644 --- a/wakatime/session_cache.py +++ b/wakatime/session_cache.py @@ -33,7 +33,7 @@ class SessionCache(object): DB_FILE = os.path.join(os.path.expanduser('~'), '.wakatime.db') def connect(self): - conn = sqlite3.connect(self.DB_FILE) + conn = sqlite3.connect(self.DB_FILE, isolation_level=None) c = conn.cursor() c.execute('''CREATE TABLE IF NOT EXISTS session ( value BLOB)