From 24c12a778d2086d1a8b0a7ff7cd2a0ab5d430319 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 29 Mar 2020 22:39:48 +0200 Subject: Add platform plugin to version output (cherry picked from commit e6c189a2d86e516fda84700c90056cb0da6d66e3) --- qutebrowser/utils/version.py | 2 ++ tests/helpers/stubs.py | 5 +++-- tests/unit/utils/test_version.py | 15 +++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 13535e44e..1e9da8ef1 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -441,6 +441,8 @@ def version() -> str: if qapp: style = qapp.style() lines.append('Style: {}'.format(style.metaObject().className())) + platform_name = qapp.platformName() + lines.append('Platform plugin: {}'.format(platform_name)) importpath = os.path.dirname(os.path.abspath(qutebrowser.__file__)) diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py index ff6690da5..caa7aac3f 100644 --- a/tests/helpers/stubs.py +++ b/tests/helpers/stubs.py @@ -115,8 +115,8 @@ class FakeQApplication: UNSET = object() - def __init__(self, style=None, all_widgets=None, active_window=None, - instance=UNSET, arguments=None): + def __init__(self, *, style=None, all_widgets=None, active_window=None, + instance=UNSET, arguments=None, platform_name=None): if instance is self.UNSET: self.instance = mock.Mock(return_value=self) @@ -129,6 +129,7 @@ class FakeQApplication: self.allWidgets = lambda: all_widgets self.activeWindow = lambda: active_window self.arguments = lambda: arguments + self.platformName = lambda: platform_name class FakeNetworkReply: diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index 1b703e6b0..42a6332e2 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -897,7 +897,7 @@ class VersionParams: name = attr.ib() git_commit = attr.ib(True) frozen = attr.ib(False) - style = attr.ib(True) + qapp = attr.ib(True) with_webkit = attr.ib(True) known_distribution = attr.ib(True) ssl_support = attr.ib(True) @@ -909,7 +909,7 @@ class VersionParams: VersionParams('normal'), VersionParams('no-git-commit', git_commit=False), VersionParams('frozen', frozen=True), - VersionParams('no-style', style=False), + VersionParams('no-qapp', qapp=False), VersionParams('no-webkit', with_webkit=False), VersionParams('unknown-dist', known_distribution=False), VersionParams('no-ssl', ssl_support=False), @@ -937,8 +937,9 @@ def test_version_output(params, stubs, monkeypatch, config_stub): 'platform.architecture': lambda: ('ARCHITECTURE', ''), '_os_info': lambda: ['OS INFO 1', 'OS INFO 2'], '_path_info': lambda: {'PATH DESC': 'PATH NAME'}, - 'QApplication': (stubs.FakeQApplication(style='STYLE') - if params.style else + 'QApplication': (stubs.FakeQApplication(style='STYLE', + platform_name='PLATFORM') + if params.qapp else stubs.FakeQApplication(instance=None)), 'QLibraryInfo.location': (lambda _loc: 'QT PATH'), 'sql.version': lambda: 'SQLITE VERSION', @@ -948,7 +949,9 @@ def test_version_output(params, stubs, monkeypatch, config_stub): substitutions = { 'git_commit': '\nGit commit: GIT COMMIT' if params.git_commit else '', - 'style': '\nStyle: STYLE' if params.style else '', + 'style': '\nStyle: STYLE' if params.qapp else '', + 'platform_plugin': ('\nPlatform plugin: PLATFORM' if params.qapp + else ''), 'qt': 'QT VERSION', 'frozen': str(params.frozen), 'import_path': import_path, @@ -1014,7 +1017,7 @@ def test_version_output(params, stubs, monkeypatch, config_stub): pdf.js: PDFJS VERSION sqlite: SQLITE VERSION QtNetwork SSL: {ssl} - {style} + {style}{platform_plugin} Platform: PLATFORM, ARCHITECTURE{linuxdist} Frozen: {frozen} Imported from {import_path} -- cgit v1.2.3-54-g00ecf