aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2017-02-09 14:06:36 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2017-02-09 16:08:36 +0100
commit2ff5d7223623fe40a14db62eaae8a1a18385e7fe (patch)
tree01cb2c9facf671708e3a64c67acb465b078d02b2
parent0299bb5b2e4870363ba0c402c6cf15722ca0ee0f (diff)
downloadmitmproxy-2ff5d7223623fe40a14db62eaae8a1a18385e7fe.tar.gz
mitmproxy-2ff5d7223623fe40a14db62eaae8a1a18385e7fe.tar.bz2
mitmproxy-2ff5d7223623fe40a14db62eaae8a1a18385e7fe.zip
minor changes
-rw-r--r--mitmproxy/eventsequence.py2
-rw-r--r--mitmproxy/version.py2
-rw-r--r--test/mitmproxy/test_eventsequence.py2
-rw-r--r--test/mitmproxy/test_version.py10
4 files changed, 13 insertions, 3 deletions
diff --git a/mitmproxy/eventsequence.py b/mitmproxy/eventsequence.py
index 905cb7bc..5872f607 100644
--- a/mitmproxy/eventsequence.py
+++ b/mitmproxy/eventsequence.py
@@ -70,4 +70,4 @@ def iterate(f):
yield "tcp_error", f
yield "tcp_end", f
else:
- raise ValueError
+ raise TypeError()
diff --git a/mitmproxy/version.py b/mitmproxy/version.py
index a5faf511..22382c94 100644
--- a/mitmproxy/version.py
+++ b/mitmproxy/version.py
@@ -3,5 +3,5 @@ VERSION = ".".join(str(i) for i in IVERSION)
PATHOD = "pathod " + VERSION
MITMPROXY = "mitmproxy " + VERSION
-if __name__ == "__main__": # pragma: no cover
+if __name__ == "__main__":
print(VERSION)
diff --git a/test/mitmproxy/test_eventsequence.py b/test/mitmproxy/test_eventsequence.py
index 6e254225..fe0f92b3 100644
--- a/test/mitmproxy/test_eventsequence.py
+++ b/test/mitmproxy/test_eventsequence.py
@@ -53,5 +53,5 @@ def test_tcp_flow(err):
def test_invalid():
- with pytest.raises(ValueError):
+ with pytest.raises(TypeError):
next(eventsequence.iterate(42))
diff --git a/test/mitmproxy/test_version.py b/test/mitmproxy/test_version.py
new file mode 100644
index 00000000..f87b0851
--- /dev/null
+++ b/test/mitmproxy/test_version.py
@@ -0,0 +1,10 @@
+import runpy
+
+from mitmproxy import version
+
+
+def test_version(capsys):
+ runpy.run_module('mitmproxy.version', run_name='__main__')
+ stdout, stderr = capsys.readouterr()
+ assert len(stdout) > 0
+ assert stdout.strip() == version.VERSION