diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2018-01-04 19:03:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 19:03:51 +0100 |
| commit | c1c1652082f680e7448e44cfbbb536223a100a09 (patch) | |
| tree | ce6093a52d2d99c7657e2e77dc44eacd71d74bf7 | |
| parent | 1e03a5d31e3520751a619a755a0e0866fbb5369d (diff) | |
| parent | dd7902cf7fbdb5f34b0b7dd6c406f95754b4907a (diff) | |
| download | mitmproxy-c1c1652082f680e7448e44cfbbb536223a100a09.tar.gz mitmproxy-c1c1652082f680e7448e44cfbbb536223a100a09.tar.bz2 mitmproxy-c1c1652082f680e7448e44cfbbb536223a100a09.zip | |
Merge pull request #2754 from mhils/issue-2470
fix #2470
| -rw-r--r-- | mitmproxy/version.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/test_version.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mitmproxy/version.py b/mitmproxy/version.py index 44ec32d4..20a303e8 100644 --- a/mitmproxy/version.py +++ b/mitmproxy/version.py @@ -60,5 +60,5 @@ def get_version(dev: bool = False, build: bool = False, refresh: bool = False) - return mitmproxy_version -if __name__ == "__main__": +if __name__ == "__main__": # pragma: no cover print(VERSION) diff --git a/test/mitmproxy/test_version.py b/test/mitmproxy/test_version.py index 6e36ffd8..b5b33ba1 100644 --- a/test/mitmproxy/test_version.py +++ b/test/mitmproxy/test_version.py @@ -1,3 +1,4 @@ +import pathlib import runpy import subprocess from unittest import mock @@ -6,7 +7,9 @@ from mitmproxy import version def test_version(capsys): - runpy.run_module('mitmproxy.version', run_name='__main__') + here = pathlib.Path(__file__).absolute().parent + version_file = here / ".." / ".." / "mitmproxy" / "version.py" + runpy.run_path(str(version_file), run_name='__main__') stdout, stderr = capsys.readouterr() assert len(stdout) > 0 assert stdout.strip() == version.VERSION |