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

Log basedir and save it in QuteProcess for tests.

Browse Source
This commit is contained in:
Florian Bruhin 2015-11-28 23:35:32 +01:00
parent e26c499bd6
commit f5febc4807
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/utils/standarddir.py
View File

@ -190,6 +190,7 @@ def _maybe_create(path):
def init(args): def init(args):
"""Initialize all standard dirs.""" """Initialize all standard dirs."""
global _args global _args
log.init.debug("Base directory: {}".format(args.basedir))
_args = args _args = args
_init_cachedir_tag() _init_cachedir_tag()

7
tests/integration/quteprocess.py
View File

@ -119,6 +119,7 @@ class QuteProc(testprocess.Process):
_delay: Delay to wait between commands. _delay: Delay to wait between commands.
_ipc_socket: The IPC socket of the started instance. _ipc_socket: The IPC socket of the started instance.
_httpbin: The HTTPBin webserver. _httpbin: The HTTPBin webserver.
basedir: The base directory for this instance.
Signals: Signals:
got_error: Emitted when there was an error log line. got_error: Emitted when there was an error log line.
@ -134,6 +135,7 @@ class QuteProc(testprocess.Process):
self._delay = delay self._delay = delay
self._httpbin = httpbin self._httpbin = httpbin
self._ipc_socket = None self._ipc_socket = None
self.basedir = None
def _parse_line(self, line): def _parse_line(self, line):
try: try:
@ -163,6 +165,11 @@ class QuteProc(testprocess.Process):
elif (log_line.category == 'webview' and elif (log_line.category == 'webview' and
log_line.message == start_okay_message): log_line.message == start_okay_message):
self.ready.emit() self.ready.emit()
elif (log_line.category == 'init' and
log_line.module == 'standarddir' and
log_line.function == 'init' and
log_line.message.startswith('Base directory:')):
self.basedir = log_line.message.split(':', maxsplit=1)[1].strip()
elif log_line.loglevel > logging.INFO: elif log_line.loglevel > logging.INFO:
self.got_error.emit() self.got_error.emit()