diff options
| author | Ben Burry <bburry@etsy.com> | 2014-11-11 16:12:19 +0000 |
|---|---|---|
| committer | Ben Burry <bburry@etsy.com> | 2014-11-11 16:12:19 +0000 |
| commit | 370d5683e6ad2e9499e3149fe75417cd92e2ea2c (patch) | |
| tree | 578c6b2ae0df85cb990a482e22695cb38a19a544 | |
| parent | e961ad90d3801eea0fd52ee89af644b3339ae3f5 (diff) | |
| download | logster-370d5683e6ad2e9499e3149fe75417cd92e2ea2c.zip logster-370d5683e6ad2e9499e3149fe75417cd92e2ea2c.tar.gz logster-370d5683e6ad2e9499e3149fe75417cd92e2ea2c.tar.bz2 | |
Convert assertRaises contextmanager to function call
UnitTest.assertRaises only became usable as a contextmanager in python 2.7, so
was causing failures in our 2.6 unit tests
| -rw-r--r-- | tests/test_errorloglogster.py | 3 | ||||
| -rw-r--r-- | tests/test_log4jlogster.py | 12 | ||||
| -rw-r--r-- | tests/test_samplelogster.py | 3 | ||||
| -rw-r--r-- | tests/test_squidlogster.py | 3 |
4 files changed, 7 insertions, 14 deletions
diff --git a/tests/test_errorloglogster.py b/tests/test_errorloglogster.py index 256a085..5dd0753 100644 --- a/tests/test_errorloglogster.py +++ b/tests/test_errorloglogster.py @@ -49,8 +49,7 @@ class TestErrorLogLogster(unittest.TestCase): self.assertEqual(expected[m.name], m.value) def test_invalid_line(self): - with self.assertRaises(LogsterParsingException): - self.logster.parse_line('invalid log entry') + self.assertRaises(LogsterParsingException, self.logster.parse_line, 'invalid log entry') if __name__ == '__main__': unittest.main() diff --git a/tests/test_log4jlogster.py b/tests/test_log4jlogster.py index 0e3cadc..56715d7 100644 --- a/tests/test_log4jlogster.py +++ b/tests/test_log4jlogster.py @@ -16,8 +16,7 @@ class TestLog4jLogster(unittest.TestCase): self.assertEqual(2, self.logster.ERROR) self.assertEqual(0, self.logster.FATAL) - with self.assertRaises(LogsterParsingException): - self.logster.parse_line(self.log_tmpl % 'DEBUG') + self.assertRaises(LogsterParsingException, self.logster.parse_line, self.log_tmpl % 'DEBUG') self.assertFalse(hasattr(self.logster, 'DEBUG')) def test_valid_lines_non_default(self): @@ -25,10 +24,8 @@ class TestLog4jLogster(unittest.TestCase): debug_logster.parse_line(self.log_tmpl % 'DEBUG') self.assertEqual(1, debug_logster.DEBUG) - with self.assertRaises(LogsterParsingException): - debug_logster.parse_line(self.log_tmpl % 'WARN') - debug_logster.parse_line(self.log_tmpl % 'ERROR') - debug_logster.parse_line(self.log_tmpl % 'ERROR') + self.assertRaises(LogsterParsingException, debug_logster.parse_line, self.log_tmpl % 'WARN') + self.assertRaises(LogsterParsingException, debug_logster.parse_line, self.log_tmpl % 'ERROR') self.assertFalse(hasattr(debug_logster, 'WARN')) self.assertFalse(hasattr(debug_logster, 'ERROR')) self.assertFalse(hasattr(debug_logster, 'FATAL')) @@ -58,8 +55,7 @@ class TestLog4jLogster(unittest.TestCase): self.assertEqual(expected[m.name], m.value) def test_invalid_line(self): - with self.assertRaises(LogsterParsingException): - self.logster.parse_line('invalid log entry') + self.assertRaises(LogsterParsingException, self.logster.parse_line, 'invalid log entry') if __name__ == '__main__': unittest.main() diff --git a/tests/test_samplelogster.py b/tests/test_samplelogster.py index 71f50fa..e78f32e 100644 --- a/tests/test_samplelogster.py +++ b/tests/test_samplelogster.py @@ -47,8 +47,7 @@ class TestSampleLogster(unittest.TestCase): self.assertEqual(expected[m.name], m.value) def test_invalid_line(self): - with self.assertRaises(LogsterParsingException): - self.logster.parse_line('invalid log entry') + self.assertRaises(LogsterParsingException, self.logster.parse_line, 'invalid log entry') if __name__ == '__main__': unittest.main() diff --git a/tests/test_squidlogster.py b/tests/test_squidlogster.py index 2346ab4..1049746 100644 --- a/tests/test_squidlogster.py +++ b/tests/test_squidlogster.py @@ -66,8 +66,7 @@ class TestSquidLogster(unittest.TestCase): self.assertEqual(expected[m.name], m.value) def test_invalid_line(self): - with self.assertRaises(LogsterParsingException): - self.logster.parse_line('invalid log entry') + self.assertRaises(LogsterParsingException, self.logster.parse_line, 'invalid log entry') if __name__ == '__main__': unittest.main() |