From 9a478487940478edd6bc41034d88c02617c84ffe Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 18:22:13 +0200 Subject: [PATCH 01/10] Create a new module and convert test_single --- .../test/utils/debug/test_qflags_key.py | 33 +++++++++++++++++++ qutebrowser/test/utils/test_debug.py | 6 ---- 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 qutebrowser/test/utils/debug/test_qflags_key.py diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py new file mode 100644 index 000000000..8b0116812 --- /dev/null +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -0,0 +1,33 @@ +# Copyright 2014-2015 Florian Bruhin (The Compiler) +# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: + +# +# This file is part of qutebrowser. +# +# qutebrowser is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# qutebrowser is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with qutebrowser. If not, see . + +"""Tests for qutebrowser.utils.debug.qflags_key.""" + +import pytest + +from PyQt5.QtCore import Qt +from qutebrowser.utils import debug + + +@pytest.mark.xfail(reason="Broken but shouldn't generate a failure") +def test_single(): + """Test with single value.""" + + flags = debug.qflags_key(Qt, Qt.AlignTop) + assert flags == 'AlignTop' diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index 36d261297..4f1262caa 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -37,12 +37,6 @@ class QFlagsKeyTests(unittest.TestCase): # https://github.com/The-Compiler/qutebrowser/issues/42 - @unittest.skip('FIXME') - def test_single(self): - """Test with single value.""" - flags = debug.qflags_key(Qt, Qt.AlignTop) - self.assertEqual(flags, 'AlignTop') - @unittest.skip('FIXME') def test_multiple(self): """Test with multiple values.""" From f68cfc13e02632ad17b6e4b462497248893ea7bf Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 18:25:28 +0200 Subject: [PATCH 02/10] Convert test_multiple and use custom xfail marker --- qutebrowser/test/utils/debug/test_qflags_key.py | 13 ++++++++++++- qutebrowser/test/utils/test_debug.py | 6 ------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py index 8b0116812..f5214f3e0 100644 --- a/qutebrowser/test/utils/debug/test_qflags_key.py +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -25,9 +25,20 @@ from PyQt5.QtCore import Qt from qutebrowser.utils import debug -@pytest.mark.xfail(reason="Broken but shouldn't generate a failure") +fixme = pytest.mark.xfail(reason="Broken but shouldn't generate a failure") + + +@fixme def test_single(): """Test with single value.""" flags = debug.qflags_key(Qt, Qt.AlignTop) assert flags == 'AlignTop' + + +@fixme +def test_multiple(): + """Test with multiple values.""" + + flags = debug.qflags_key(Qt, Qt.AlignLeft | Qt.AlignTop) + assert flags == 'AlignLeft|AlignTop' diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index 4f1262caa..05a8e1eb2 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -37,12 +37,6 @@ class QFlagsKeyTests(unittest.TestCase): # https://github.com/The-Compiler/qutebrowser/issues/42 - @unittest.skip('FIXME') - def test_multiple(self): - """Test with multiple values.""" - flags = debug.qflags_key(Qt, Qt.AlignLeft | Qt.AlignTop) - self.assertEqual(flags, 'AlignLeft|AlignTop') - def test_combined(self): """Test with a combined value.""" flags = debug.qflags_key(Qt, Qt.AlignCenter) From 6482025399062e68e77cae05afcec42816495478 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 18:29:33 +0200 Subject: [PATCH 03/10] Convert test_combined --- qutebrowser/test/utils/debug/test_qflags_key.py | 7 +++++++ qutebrowser/test/utils/test_debug.py | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py index f5214f3e0..2007c85b0 100644 --- a/qutebrowser/test/utils/debug/test_qflags_key.py +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -42,3 +42,10 @@ def test_multiple(): flags = debug.qflags_key(Qt, Qt.AlignLeft | Qt.AlignTop) assert flags == 'AlignLeft|AlignTop' + + +def test_combined(): + """Test with a combined value.""" + + flags = debug.qflags_key(Qt, Qt.AlignCenter) + assert flags == 'AlignHCenter|AlignVCenter' diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index 05a8e1eb2..078e83c07 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -37,11 +37,6 @@ class QFlagsKeyTests(unittest.TestCase): # https://github.com/The-Compiler/qutebrowser/issues/42 - def test_combined(self): - """Test with a combined value.""" - flags = debug.qflags_key(Qt, Qt.AlignCenter) - self.assertEqual(flags, 'AlignHCenter|AlignVCenter') - @unittest.skip('FIXME') def test_add_base(self): """Test with add_base=True.""" From 75e927f79ede6dc22170cf731bba321d0e0e8c29 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 18:33:22 +0200 Subject: [PATCH 04/10] Convert test_add_base --- qutebrowser/test/utils/debug/test_qflags_key.py | 8 ++++++++ qutebrowser/test/utils/test_debug.py | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py index 2007c85b0..3f69a1158 100644 --- a/qutebrowser/test/utils/debug/test_qflags_key.py +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -49,3 +49,11 @@ def test_combined(): flags = debug.qflags_key(Qt, Qt.AlignCenter) assert flags == 'AlignHCenter|AlignVCenter' + + +@fixme +def test_add_base(): + """Test with add_base=True.""" + + flags = debug.qflags_key(Qt, Qt.AlignTop, add_base=True) + assert flags == 'Qt.AlignTop' diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index 078e83c07..beb6efd1c 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -37,12 +37,6 @@ class QFlagsKeyTests(unittest.TestCase): # https://github.com/The-Compiler/qutebrowser/issues/42 - @unittest.skip('FIXME') - def test_add_base(self): - """Test with add_base=True.""" - flags = debug.qflags_key(Qt, Qt.AlignTop, add_base=True) - self.assertEqual(flags, 'Qt.AlignTop') - def test_int_noklass(self): """Test passing an int without explicit klass given.""" with self.assertRaises(TypeError): From 086f12600c8f84be8b60358dae13cfedf34c4208 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 18:37:12 +0200 Subject: [PATCH 05/10] Convert test_int_noklass --- qutebrowser/test/utils/debug/test_qflags_key.py | 7 +++++++ qutebrowser/test/utils/test_debug.py | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py index 3f69a1158..de1d0e49c 100644 --- a/qutebrowser/test/utils/debug/test_qflags_key.py +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -57,3 +57,10 @@ def test_add_base(): flags = debug.qflags_key(Qt, Qt.AlignTop, add_base=True) assert flags == 'Qt.AlignTop' + + +def test_int_noklass(): + """Test passing an int without explicit klass given.""" + + with pytest.raises(TypeError): + debug.qflags_key(Qt, 42) diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index beb6efd1c..0f453f1c1 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -37,11 +37,6 @@ class QFlagsKeyTests(unittest.TestCase): # https://github.com/The-Compiler/qutebrowser/issues/42 - def test_int_noklass(self): - """Test passing an int without explicit klass given.""" - with self.assertRaises(TypeError): - debug.qflags_key(Qt, 42) - @unittest.skip('FIXME') def test_int(self): """Test passing an int with explicit klass given.""" From ff75d18e624844e0fcbc04d7e2332f30bb459990 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 18:40:41 +0200 Subject: [PATCH 06/10] Convert test_int --- qutebrowser/test/utils/debug/test_qflags_key.py | 7 +++++++ qutebrowser/test/utils/test_debug.py | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py index de1d0e49c..f2c4ecef3 100644 --- a/qutebrowser/test/utils/debug/test_qflags_key.py +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -64,3 +64,10 @@ def test_int_noklass(): with pytest.raises(TypeError): debug.qflags_key(Qt, 42) + +@fixme +def test_int(): + """Test passing an int with explicit klass given.""" + + flags = debug.qflags_key(Qt, 0x0021, klass=Qt.Alignment) + assert flags == 'AlignLeft|AlignTop' diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index 0f453f1c1..23d05b8ee 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -37,12 +37,6 @@ class QFlagsKeyTests(unittest.TestCase): # https://github.com/The-Compiler/qutebrowser/issues/42 - @unittest.skip('FIXME') - def test_int(self): - """Test passing an int with explicit klass given.""" - flags = debug.qflags_key(Qt, 0x0021, klass=Qt.Alignment) - self.assertEqual(flags, 'AlignLeft|AlignTop') - def test_unknown(self): """Test passing an unknown value.""" flags = debug.qflags_key(Qt, 0x1100, klass=Qt.Alignment) From 0b063ab4b42837e561c2d498ba03741b6b14f42c Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 18:51:40 +0200 Subject: [PATCH 07/10] Convert test_unknown --- qutebrowser/test/utils/debug/test_qflags_key.py | 12 +++++++++++- qutebrowser/test/utils/test_debug.py | 12 ------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py index f2c4ecef3..fecc808ce 100644 --- a/qutebrowser/test/utils/debug/test_qflags_key.py +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -17,7 +17,10 @@ # You should have received a copy of the GNU General Public License # along with qutebrowser. If not, see . -"""Tests for qutebrowser.utils.debug.qflags_key.""" +"""Tests for qutebrowser.utils.debug.qflags_key. + +https://github.com/The-Compiler/qutebrowser/issues/42 +""" import pytest @@ -65,9 +68,16 @@ def test_int_noklass(): with pytest.raises(TypeError): debug.qflags_key(Qt, 42) + @fixme def test_int(): """Test passing an int with explicit klass given.""" flags = debug.qflags_key(Qt, 0x0021, klass=Qt.Alignment) assert flags == 'AlignLeft|AlignTop' + + +def test_unknown(): + """Test passing an unknown value.""" + flags = debug.qflags_key(Qt, 0x1100, klass=Qt.Alignment) + assert flags == '0x0100|0x1000' diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index 23d05b8ee..737763044 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -31,18 +31,6 @@ from qutebrowser.utils import debug from qutebrowser.test import stubs -class QFlagsKeyTests(unittest.TestCase): - - """Tests for qflags_key().""" - - # https://github.com/The-Compiler/qutebrowser/issues/42 - - def test_unknown(self): - """Test passing an unknown value.""" - flags = debug.qflags_key(Qt, 0x1100, klass=Qt.Alignment) - self.assertEqual(flags, '0x0100|0x1000') - - class TestDebug(unittest.TestCase): """Test signal debug output functions.""" From 5b372aeee0e81b94652702f08afb5d9dce1fe90f Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 18:55:24 +0200 Subject: [PATCH 08/10] Remove blank lines in test_qflags_key --- qutebrowser/test/utils/debug/test_qflags_key.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py index fecc808ce..371efdeff 100644 --- a/qutebrowser/test/utils/debug/test_qflags_key.py +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -34,7 +34,6 @@ fixme = pytest.mark.xfail(reason="Broken but shouldn't generate a failure") @fixme def test_single(): """Test with single value.""" - flags = debug.qflags_key(Qt, Qt.AlignTop) assert flags == 'AlignTop' @@ -42,14 +41,12 @@ def test_single(): @fixme def test_multiple(): """Test with multiple values.""" - flags = debug.qflags_key(Qt, Qt.AlignLeft | Qt.AlignTop) assert flags == 'AlignLeft|AlignTop' def test_combined(): """Test with a combined value.""" - flags = debug.qflags_key(Qt, Qt.AlignCenter) assert flags == 'AlignHCenter|AlignVCenter' @@ -57,14 +54,12 @@ def test_combined(): @fixme def test_add_base(): """Test with add_base=True.""" - flags = debug.qflags_key(Qt, Qt.AlignTop, add_base=True) assert flags == 'Qt.AlignTop' def test_int_noklass(): """Test passing an int without explicit klass given.""" - with pytest.raises(TypeError): debug.qflags_key(Qt, 42) @@ -72,7 +67,6 @@ def test_int_noklass(): @fixme def test_int(): """Test passing an int with explicit klass given.""" - flags = debug.qflags_key(Qt, 0x0021, klass=Qt.Alignment) assert flags == 'AlignLeft|AlignTop' From 05087b976a2d9ec5821e618dc9a142d8d0b04316 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 3 Apr 2015 23:43:06 +0200 Subject: [PATCH 09/10] test_qflags_key: Improve xfail message. --- qutebrowser/test/utils/debug/test_qflags_key.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/test/utils/debug/test_qflags_key.py b/qutebrowser/test/utils/debug/test_qflags_key.py index 371efdeff..6a2a85069 100644 --- a/qutebrowser/test/utils/debug/test_qflags_key.py +++ b/qutebrowser/test/utils/debug/test_qflags_key.py @@ -28,7 +28,7 @@ from PyQt5.QtCore import Qt from qutebrowser.utils import debug -fixme = pytest.mark.xfail(reason="Broken but shouldn't generate a failure") +fixme = pytest.mark.xfail(reason="See issue #42", raises=AssertionError) @fixme From 2ac0c7b8f07844ecfbbf2be4356d0b0d5264afd9 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 3 Apr 2015 23:52:13 +0200 Subject: [PATCH 10/10] Remove now unused import from test_debug. --- qutebrowser/test/utils/test_debug.py | 1 - 1 file changed, 1 deletion(-) diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index 737763044..107f06d32 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -24,7 +24,6 @@ import time import unittest import logging -from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QStyle, QFrame from qutebrowser.utils import debug