diff options
| author | neeasade <nathanisom27@gmail.com> | 2015-09-29 13:59:22 -0500 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-09-30 07:07:36 +0200 |
| commit | 7a33dff986cd4851cab4a422aa2e6cfa3313836f (patch) | |
| tree | 39eb02741d50cc449266b5336335cdf7e8922852 | |
| parent | e62a18f8e8dd107304cc72b511e0dbe3883bf1fe (diff) | |
| download | qutebrowser-7a33dff986cd4851cab4a422aa2e6cfa3313836f.tar.gz qutebrowser-7a33dff986cd4851cab4a422aa2e6cfa3313836f.zip | |
Empty osver for linux, adjust test to match this.
| -rw-r--r-- | qutebrowser/utils/version.py | 2 | ||||
| -rw-r--r-- | tests/unit/utils/test_version.py | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index e0e966615..6975ba5fa 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -162,7 +162,7 @@ def _os_info(): lines = [] releaseinfo = None if sys.platform == 'linux': - osver = ', '.join([e for e in platform.dist() if e]) + osver = '' releaseinfo = _release_info() elif sys.platform == 'win32': osver = ', '.join(platform.win32_ver()) diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index 80f8f2909..ed6dda906 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -451,25 +451,16 @@ class TestOsInfo: """Tests for _os_info.""" - @pytest.mark.parametrize('dist, dist_str', [ - (('x', '', 'y'), 'x, y'), - (('a', 'b', 'c'), 'a, b, c'), - (('', '', ''), ''), - ]) - def test_linux_fake(self, monkeypatch, dist, dist_str): + def test_linux_fake(self, monkeypatch): """Test with a fake Linux. - Args: - dist: The value to set platform.dist() to. - dist_str: The expected distribution string in version._os_info(). + No args because osver is set to '' if the OS is linux. """ monkeypatch.setattr('qutebrowser.utils.version.sys.platform', 'linux') monkeypatch.setattr('qutebrowser.utils.version._release_info', lambda: [('releaseinfo', 'Hello World')]) - monkeypatch.setattr('qutebrowser.utils.version.platform.dist', - lambda: dist) ret = version._os_info() - expected = ['OS Version: {}'.format(dist_str), '', + expected = ['OS Version: ', '', '--- releaseinfo ---', 'Hello World'] assert ret == expected |