summaryrefslogtreecommitdiff
path: root/tests/end2end/fixtures/quteprocess.py
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-11-03 14:05:11 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-11-04 18:30:04 +0100
commit9f9d4d7b5b10cfaa1e47a7115bdfd77175d38a82 (patch)
tree8a20420b755cf0b04330f497d670388df1991250 /tests/end2end/fixtures/quteprocess.py
parent905503efd4e726d0b29073ec1de7fe7b7fae8983 (diff)
downloadqutebrowser-9f9d4d7b5b10cfaa1e47a7115bdfd77175d38a82.tar.gz
qutebrowser-9f9d4d7b5b10cfaa1e47a7115bdfd77175d38a82.zip
old qt: Remove various test workarounds
Diffstat (limited to 'tests/end2end/fixtures/quteprocess.py')
-rw-r--r--tests/end2end/fixtures/quteprocess.py28
1 files changed, 10 insertions, 18 deletions
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 423d43623..7be9da3ac 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -819,24 +819,16 @@ class QuteProc(testprocess.Process):
raise ValueError("Invalid URL {}: {}".format(url,
qurl.errorString()))
- if (qurl == QUrl('about:blank') and
- not qtutils.version_check('5.10', compiled=False)):
- # For some reason, we don't get a LoadStatus.success for
- # about:blank sometimes.
- # However, if we do this for Qt 5.10, we get general testsuite
- # instability as site loads get reported with about:blank...
- pattern = "Changing title for idx * to 'about:blank'"
- else:
- # We really need the same representation that the webview uses in
- # its __repr__
- url = utils.elide(qurl.toDisplayString(QUrl.EncodeUnicode), 100)
- assert url
-
- pattern = re.compile(
- r"(load status for <qutebrowser\.browser\..* "
- r"tab_id=\d+ url='{url}/?'>: LoadStatus\.{load_status}|fetch: "
- r"PyQt5\.QtCore\.QUrl\('{url}'\) -> .*)".format(
- load_status=re.escape(load_status), url=re.escape(url)))
+ # We really need the same representation that the webview uses in
+ # its __repr__
+ url = utils.elide(qurl.toDisplayString(QUrl.EncodeUnicode), 100)
+ assert url
+
+ pattern = re.compile(
+ r"(load status for <qutebrowser\.browser\..* "
+ r"tab_id=\d+ url='{url}/?'>: LoadStatus\.{load_status}|fetch: "
+ r"PyQt5\.QtCore\.QUrl\('{url}'\) -> .*)".format(
+ load_status=re.escape(load_status), url=re.escape(url)))
try:
self.wait_for(message=pattern, timeout=timeout, after=after)