From 9dc3d16bf2554ca1fb6d191c232d096fe0774110 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Wed, 27 Dec 2017 21:46:52 +0100
Subject: single-source version processing

---
 test/mitmproxy/test_version.py     | 23 +++++++++++++++++++++++
 test/mitmproxy/utils/test_debug.py | 13 -------------
 2 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/test/mitmproxy/test_version.py b/test/mitmproxy/test_version.py
index f87b0851..f8d646dc 100644
--- a/test/mitmproxy/test_version.py
+++ b/test/mitmproxy/test_version.py
@@ -1,4 +1,6 @@
 import runpy
+import subprocess
+from unittest import mock
 
 from mitmproxy import version
 
@@ -8,3 +10,24 @@ def test_version(capsys):
     stdout, stderr = capsys.readouterr()
     assert len(stdout) > 0
     assert stdout.strip() == version.VERSION
+
+
+def test_get_version_hardcoded():
+    version.VERSION = "3.0.0.dev123-0xcafebabe"
+    assert version.get_version() == "3.0.0"
+    assert version.get_version(True) == "3.0.0.dev123"
+    assert version.get_version(True, True) == "3.0.0.dev123-0xcafebabe"
+
+
+def test_get_version():
+    version.VERSION = "3.0.0"
+
+    with mock.patch('subprocess.check_output') as m:
+        m.return_value = b"tag-0-cafecafe"
+        assert version.get_version(True, True) == "3.0.0"
+
+        m.return_value = b"tag-2-cafecafe"
+        assert version.get_version(True, True) == "3.0.0.dev0002-0xcafecaf"
+
+        m.side_effect = subprocess.CalledProcessError(-1, 'git describe --tags --long')
+        assert version.get_version(True, True) == "3.0.0"
diff --git a/test/mitmproxy/utils/test_debug.py b/test/mitmproxy/utils/test_debug.py
index a8e1054d..0ca6ead0 100644
--- a/test/mitmproxy/utils/test_debug.py
+++ b/test/mitmproxy/utils/test_debug.py
@@ -1,5 +1,4 @@
 import io
-import subprocess
 import sys
 from unittest import mock
 import pytest
@@ -14,18 +13,6 @@ def test_dump_system_info_precompiled(precompiled):
         assert ("binary" in debug.dump_system_info()) == precompiled
 
 
-def test_dump_system_info_version():
-    with mock.patch('subprocess.check_output') as m:
-        m.return_value = b"v2.0.0-0-cafecafe"
-        x = debug.dump_system_info()
-        assert 'dev' not in x
-        assert 'cafecafe' in x
-
-    with mock.patch('subprocess.check_output') as m:
-        m.side_effect = subprocess.CalledProcessError(-1, 'git describe --tags --long')
-        assert 'dev' not in debug.dump_system_info()
-
-
 def test_dump_info():
     cs = io.StringIO()
     debug.dump_info(None, None, file=cs, testing=True)
-- 
cgit v1.2.3