From e86a79740a88230826f742af9ce01a292b379302 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 7 Jun 2015 02:30:36 +0200 Subject: [PATCH] Use raising=True for QtBot.waitSignal. --- tests/javascript/conftest.py | 4 ++-- tests/utils/test_log.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/javascript/conftest.py b/tests/javascript/conftest.py index d97b38625..442ad73cb 100644 --- a/tests/javascript/conftest.py +++ b/tests/javascript/conftest.py @@ -80,7 +80,7 @@ class JSTester: def scroll_anchor(self, name): """Scroll the main frame to the given anchor.""" page = self.webview.page() - with self._qtbot.waitSignal(page.scrollRequested): + with self._qtbot.waitSignal(page.scrollRequested, raising=True): page.mainFrame().scrollToAnchor(name) def load(self, path, **kwargs): @@ -92,7 +92,7 @@ class JSTester: **kwargs: Passed to jinja's template.render(). """ template = self._jinja_env.get_template(path) - with self._qtbot.waitSignal(self.webview.loadFinished): + with self._qtbot.waitSignal(self.webview.loadFinished, raising=True): self.webview.setHtml(template.render(**kwargs)) def run_file(self, filename): diff --git a/tests/utils/test_log.py b/tests/utils/test_log.py index eadaa7470..03575ea5b 100644 --- a/tests/utils/test_log.py +++ b/tests/utils/test_log.py @@ -213,7 +213,7 @@ class TestInitLog: @pytest.fixture def args(self): - """Fixture providing an argparse namespace.""" + """Fixture providing an argparse namespace for init_log.""" return argparse.Namespace(debug=True, loglevel=logging.DEBUG, color=True, loglines=10, logfilter="")