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

tests: update test_invocations for --json-logging

Browse Source
This commit is contained in:
Daniel Schadt 2016-05-25 13:13:36 +02:00
parent 4a59a1f112
commit 49419bc429
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/end2end/test_invocations.py
View File

@ -21,6 +21,8 @@
import pytest import pytest
BASE_ARGS = ['--debug', '--json-logging', '--no-err-windows', 'about:blank']
@pytest.fixture @pytest.fixture
def temp_basedir_env(tmpdir): def temp_basedir_env(tmpdir):
@ -52,7 +54,7 @@ def temp_basedir_env(tmpdir):
@pytest.mark.linux @pytest.mark.linux
def test_no_config(temp_basedir_env, quteproc_new): def test_no_config(temp_basedir_env, quteproc_new):
"""Test starting with -c "".""" """Test starting with -c ""."""
args = ['--debug', '--no-err-windows', '-c', '', 'about:blank'] args = ['-c', ''] + BASE_ARGS
quteproc_new.start(args, env=temp_basedir_env) quteproc_new.start(args, env=temp_basedir_env)
quteproc_new.send_cmd(':quit') quteproc_new.send_cmd(':quit')
quteproc_new.wait_for_quit() quteproc_new.wait_for_quit()
@ -61,7 +63,7 @@ def test_no_config(temp_basedir_env, quteproc_new):
@pytest.mark.linux @pytest.mark.linux
def test_no_cache(temp_basedir_env, quteproc_new): def test_no_cache(temp_basedir_env, quteproc_new):
"""Test starting with --cachedir="".""" """Test starting with --cachedir=""."""
args = ['--debug', '--no-err-windows', '--cachedir=', 'about:blank'] args = ['--cachedir='] + BASE_ARGS
quteproc_new.start(args, env=temp_basedir_env) quteproc_new.start(args, env=temp_basedir_env)
quteproc_new.send_cmd(':quit') quteproc_new.send_cmd(':quit')
quteproc_new.wait_for_quit() quteproc_new.wait_for_quit()
@ -73,7 +75,7 @@ def test_ascii_locale(httpbin, tmpdir, quteproc_new):
https://github.com/The-Compiler/qutebrowser/issues/908 https://github.com/The-Compiler/qutebrowser/issues/908
""" """
args = ['--debug', '--no-err-windows', '--temp-basedir', 'about:blank'] args = ['--temp-basedir'] + BASE_ARGS
quteproc_new.start(args, env={'LC_ALL': 'C'}) quteproc_new.start(args, env={'LC_ALL': 'C'})
quteproc_new.set_setting('storage', 'download-directory', str(tmpdir)) quteproc_new.set_setting('storage', 'download-directory', str(tmpdir))
quteproc_new.set_setting('storage', 'prompt-download-directory', 'false') quteproc_new.set_setting('storage', 'prompt-download-directory', 'false')
@ -89,7 +91,6 @@ def test_ascii_locale(httpbin, tmpdir, quteproc_new):
def test_no_loglines(quteproc_new): def test_no_loglines(quteproc_new):
"""Test qute:log with --loglines=0.""" """Test qute:log with --loglines=0."""
quteproc_new.start(args=['--debug', '--no-err-windows', '--temp-basedir', quteproc_new.start(args=['--temp-basedir', '--loglines=0'] + BASE_ARGS)
'--loglines=0', 'about:blank'])
quteproc_new.open_path('qute:log') quteproc_new.open_path('qute:log')
assert quteproc_new.get_content() == 'Log output was disabled.' assert quteproc_new.get_content() == 'Log output was disabled.'