From db0a54b03fd61eaa52f06669914d24652f32ec9d Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 10 May 2015 15:27:35 +0200 Subject: [PATCH] Rewrite test_crashdialog.py to use pytest. See #660. --- tests/misc/test_crashdialog.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/tests/misc/test_crashdialog.py b/tests/misc/test_crashdialog.py index 6c93833b1..ae0078c99 100644 --- a/tests/misc/test_crashdialog.py +++ b/tests/misc/test_crashdialog.py @@ -19,8 +19,6 @@ """Tests for qutebrowser.misc.crashdialog.""" -import unittest - from qutebrowser.misc import crashdialog @@ -52,7 +50,7 @@ Hello world! """ -class ParseFatalStacktraceTests(unittest.TestCase): +class TestParseFatalStacktrace: """Tests for parse_fatal_stacktrace.""" @@ -60,30 +58,22 @@ class ParseFatalStacktraceTests(unittest.TestCase): """Test parse_fatal_stacktrace with a valid text.""" text = VALID_CRASH_TEXT.strip().replace('_', ' ') typ, func = crashdialog.parse_fatal_stacktrace(text) - self.assertEqual(typ, "Segmentation fault") - self.assertEqual(func, 'testfunc') + assert (typ, func) == ("Segmentation fault", 'testfunc') def test_valid_text_thread(self): """Test parse_fatal_stacktrace with a valid text #2.""" text = VALID_CRASH_TEXT_THREAD.strip().replace('_', ' ') typ, func = crashdialog.parse_fatal_stacktrace(text) - self.assertEqual(typ, "Segmentation fault") - self.assertEqual(func, 'testfunc') + assert (typ, func) == ("Segmentation fault", 'testfunc') def test_valid_text_empty(self): """Test parse_fatal_stacktrace with a valid text but empty function.""" text = VALID_CRASH_TEXT_EMPTY.strip().replace('_', ' ') typ, func = crashdialog.parse_fatal_stacktrace(text) - self.assertEqual(typ, 'Aborted') - self.assertEqual(func, '') + assert (typ, func) == ('Aborted', '') def test_invalid_text(self): """Test parse_fatal_stacktrace with an invalid text.""" text = INVALID_CRASH_TEXT.strip().replace('_', ' ') typ, func = crashdialog.parse_fatal_stacktrace(text) - self.assertEqual(typ, '') - self.assertEqual(func, '') - - -if __name__ == '__main__': - unittest.main() + assert (typ, func) == ('', '')