From 911e59b0f49cbc1594dfaf608ff93f6acd2ca6a4 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 6 Jul 2017 12:23:08 +0200
Subject: [PATCH] Improve version output without SSL support

---
 qutebrowser/utils/version.py     |  7 +++----
 tests/unit/utils/test_version.py | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index e1cc26e64..dd36f381c 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -326,11 +326,10 @@ def version():
 
     lines += _module_versions()
 
-    lines += ['pdf.js: {}'.format(_pdfjs_version())]
-
     lines += [
-        'SSL: {}'.format(QSslSocket.sslLibraryVersionString()),
-        '',
+        'pdf.js: {}'.format(_pdfjs_version()),
+        'QtNetwork SSL: {}\n'.format(QSslSocket.sslLibraryVersionString()
+                                     if QSslSocket.supportsSsl() else 'no'),
     ]
 
     qapp = QApplication.instance()
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index dae823ba9..aede735d4 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -759,14 +759,16 @@ class FakeQSslSocket:
 
     Attributes:
         _version: What QSslSocket::sslLibraryVersionString() should return.
+        _support: Whether SSL is supported.
     """
 
-    def __init__(self, version=None):
+    def __init__(self, version=None, support=True):
         self._version = version
+        self._support = support
 
     def supportsSsl(self):
         """Fake for QSslSocket::supportsSsl()."""
-        return True
+        return self._support
 
     def sslLibraryVersionString(self):
         """Fake for QSslSocket::sslLibraryVersionString()."""
@@ -802,12 +804,13 @@ def test_chromium_version_unpatched(qapp):
 class VersionParams:
 
     def __init__(self, git_commit=True, frozen=False, style=True,
-                 with_webkit=True, known_distribution=True):
+                 with_webkit=True, known_distribution=True, ssl_support=True):
         self.git_commit = git_commit
         self.frozen = frozen
         self.style = style
         self.with_webkit = with_webkit
         self.known_distribution = known_distribution
+        self.ssl_support = ssl_support
 
 
 @pytest.mark.parametrize('params', [
@@ -818,6 +821,7 @@ class VersionParams:
     VersionParams(with_webkit=False),
     VersionParams(with_webkit='ng'),
     VersionParams(known_distribution=False),
+    VersionParams(ssl_support=False),
 ])  # pylint: disable=too-many-locals
 def test_version_output(params, stubs, monkeypatch):
     """Test version.version()."""
@@ -836,7 +840,7 @@ def test_version_output(params, stubs, monkeypatch):
         'earlyinit.qt_version': lambda: 'QT VERSION',
         '_module_versions': lambda: ['MODULE VERSION 1', 'MODULE VERSION 2'],
         '_pdfjs_version': lambda: 'PDFJS VERSION',
-        'QSslSocket': FakeQSslSocket('SSL VERSION'),
+        'QSslSocket': FakeQSslSocket('SSL VERSION', params.ssl_support),
         'platform.platform': lambda: 'PLATFORM',
         'platform.architecture': lambda: ('ARCHITECTURE', ''),
         '_os_info': lambda: ['OS INFO 1', 'OS INFO 2'],
@@ -884,6 +888,8 @@ def test_version_output(params, stubs, monkeypatch):
         substitutions['linuxdist'] = ''
         substitutions['osinfo'] = 'OS INFO 1\nOS INFO 2\n'
 
+    substitutions['ssl'] = 'SSL VERSION' if params.ssl_support else 'no'
+
     for attr, val in patches.items():
         monkeypatch.setattr('qutebrowser.utils.version.' + attr, val)
 
@@ -903,7 +909,7 @@ def test_version_output(params, stubs, monkeypatch):
         MODULE VERSION 1
         MODULE VERSION 2
         pdf.js: PDFJS VERSION
-        SSL: SSL VERSION
+        QtNetwork SSL: {ssl}
         {style}
         Platform: PLATFORM, ARCHITECTURE{linuxdist}
         Frozen: {frozen}