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

Include DESKTOP_SESSION in qute:version.

Browse Source
This commit is contained in:
Florian Bruhin 2015-06-24 20:54:37 +02:00
parent 220ac021f0
commit 75b894a186
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/utils/version.py
View File

@ -198,6 +198,7 @@ def version():
'Qt: {}, runtime: {}'.format(QT_VERSION_STR, qVersion()), 'Qt: {}, runtime: {}'.format(QT_VERSION_STR, qVersion()),
'PyQt: {}'.format(PYQT_VERSION_STR), 'PyQt: {}'.format(PYQT_VERSION_STR),
'Style: {}'.format(style.metaObject().className()), 'Style: {}'.format(style.metaObject().className()),
'Desktop: {}'.format(os.environ.get('DESKTOP_SESSION')),
] ]
lines += _module_versions() lines += _module_versions()

22
tests/utils/test_version.py
View File

@ -612,38 +612,44 @@ class TestVersion:
lines = version.version().splitlines() lines = version.version().splitlines()
assert lines[5].startswith('Style: ') assert lines[5].startswith('Style: ')
def test_desktop_environment(self, monkeypatch):
"""Test the desktop environment in the output."""
monkeypatch.setenv('DESKTOP_SESSION', 'Blah')
lines = version.version().splitlines()
assert lines[6] == 'Desktop: Blah'
def test_module_versions(self, monkeypatch): def test_module_versions(self, monkeypatch):
"""Test module versions in the output.""" """Test module versions in the output."""
monkeypatch.setattr('qutebrowser.utils.version._module_versions', monkeypatch.setattr('qutebrowser.utils.version._module_versions',
lambda: ['Hello', 'World']) lambda: ['Hello', 'World'])
lines = version.version().splitlines() lines = version.version().splitlines()
assert (lines[6], lines[7]) == ('Hello', 'World') assert (lines[7], lines[8]) == ('Hello', 'World')
def test_webkit_version(self, monkeypatch): def test_webkit_version(self, monkeypatch):
"""Test the webkit version in the output.""" """Test the webkit version in the output."""
monkeypatch.setattr('qutebrowser.utils.version.qWebKitVersion', monkeypatch.setattr('qutebrowser.utils.version.qWebKitVersion',
lambda: '567.1') lambda: '567.1')
lines = version.version().splitlines() lines = version.version().splitlines()
assert lines[6] == 'Webkit: 567.1' assert lines[7] == 'Webkit: 567.1'
def test_harfbuzz_none(self, monkeypatch): def test_harfbuzz_none(self, monkeypatch):
"""Test harfbuzz output with QT_HARFBUZZ unset.""" """Test harfbuzz output with QT_HARFBUZZ unset."""
monkeypatch.delenv('QT_HARFBUZZ', raising=False) monkeypatch.delenv('QT_HARFBUZZ', raising=False)
lines = version.version().splitlines() lines = version.version().splitlines()
assert lines[7] == 'Harfbuzz: system' assert lines[8] == 'Harfbuzz: system'
def test_harfbuzz_set(self, monkeypatch): def test_harfbuzz_set(self, monkeypatch):
"""Test harfbuzz output with QT_HARFBUZZ set.""" """Test harfbuzz output with QT_HARFBUZZ set."""
monkeypatch.setenv('QT_HARFBUZZ', 'new') monkeypatch.setenv('QT_HARFBUZZ', 'new')
lines = version.version().splitlines() lines = version.version().splitlines()
assert lines[7] == 'Harfbuzz: new' assert lines[8] == 'Harfbuzz: new'
def test_ssl(self, monkeypatch): def test_ssl(self, monkeypatch):
"""Test SSL version in the output.""" """Test SSL version in the output."""
monkeypatch.setattr('qutebrowser.utils.version.QSslSocket', monkeypatch.setattr('qutebrowser.utils.version.QSslSocket',
FakeQSslSocket('1.0.1')) FakeQSslSocket('1.0.1'))
lines = version.version().splitlines() lines = version.version().splitlines()
assert lines[8] == 'SSL: 1.0.1' assert lines[9] == 'SSL: 1.0.1'
@pytest.mark.parametrize('frozen, expected', [(True, 'Frozen: True'), @pytest.mark.parametrize('frozen, expected', [(True, 'Frozen: True'),
(False, 'Frozen: False')]) (False, 'Frozen: False')])
@ -654,7 +660,7 @@ class TestVersion:
else: else:
monkeypatch.delattr(sys, 'frozen', raising=False) monkeypatch.delattr(sys, 'frozen', raising=False)
lines = version.version().splitlines() lines = version.version().splitlines()
assert lines[10] == expected assert lines[11] == expected
def test_platform(self, monkeypatch): def test_platform(self, monkeypatch):
"""Test platform in the version output.""" """Test platform in the version output."""
@ -663,11 +669,11 @@ class TestVersion:
monkeypatch.setattr('qutebrowser.utils.version.platform.architecture', monkeypatch.setattr('qutebrowser.utils.version.platform.architecture',
lambda: ('64bit', '')) lambda: ('64bit', ''))
lines = version.version().splitlines() lines = version.version().splitlines()
assert lines[11] == 'Platform: toaster, 64bit' assert lines[12] == 'Platform: toaster, 64bit'
def test_os_info(self, monkeypatch): def test_os_info(self, monkeypatch):
"""Test OS info in the output.""" """Test OS info in the output."""
monkeypatch.setattr('qutebrowser.utils.version._os_info', monkeypatch.setattr('qutebrowser.utils.version._os_info',
lambda: ['Hello', 'World']) lambda: ['Hello', 'World'])
lines = version.version().splitlines() lines = version.version().splitlines()
assert (lines[12], lines[13]) == ('Hello', 'World') assert (lines[13], lines[14]) == ('Hello', 'World')