rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Default to 5s timeout if not on CI.

Browse Source
This commit is contained in:
Florian Bruhin 2016-01-12 22:49:54 +01:00
parent adbdfcbad3
commit 8dd7f080f4
1 changed files with 8 additions and 1 deletions

9
tests/integration/quteprocess.py
View File

@ -19,6 +19,7 @@
"""Fixtures to run qutebrowser in a QProcess and communicate.""" """Fixtures to run qutebrowser in a QProcess and communicate."""
import os
import re import re
import sys import sys
import time import time
@ -288,8 +289,14 @@ class QuteProc(testprocess.Process):
line.expected = True line.expected = True
def wait_for_load_finished(self, path, *, port=None, https=False, def wait_for_load_finished(self, path, *, port=None, https=False,
timeout=15000): timeout=None):
"""Wait until any tab has finished loading.""" """Wait until any tab has finished loading."""
if timeout is None:
if 'CI' in os.environ:
timeout = 15000
else:
timeout = 5000
url = self.path_to_url(path, port=port, https=https) url = self.path_to_url(path, port=port, https=https)
# We really need the same representation that the webview uses in its # We really need the same representation that the webview uses in its
# __repr__ # __repr__