aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2013-08-25 04:31:35 +0200
committerMaximilian Hils <git@maximilianhils.com>2013-08-25 04:31:35 +0200
commit38a1135ab8f3ab2e97d07fa8e339067c67722e16 (patch)
tree9f0dcd4ba5553baeb43f2578b0a7f72680f675df
parent404445cbdff3528b0b8b45a759e5b2f2c161ae2a (diff)
downloadmitmproxy-38a1135ab8f3ab2e97d07fa8e339067c67722e16.tar.gz
mitmproxy-38a1135ab8f3ab2e97d07fa8e339067c67722e16.tar.bz2
mitmproxy-38a1135ab8f3ab2e97d07fa8e339067c67722e16.zip
add status images to README, include TestHTTPS again
-rw-r--r--.travis.yml2
-rw-r--r--README.mkd2
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 61dfe73f..c1084319 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,6 @@ install:
- "pip install --upgrade git+https://github.com/mitmproxy/pathod.git"
# command to run tests, e.g. python setup.py test
script:
- - "nosetests -e TestHTTPS --with-cov --cov-report term-missing"
+ - "nosetests --with-cov --cov-report term-missing"
after_success:
- coveralls \ No newline at end of file
diff --git a/README.mkd b/README.mkd
index 8f564d7f..35b41413 100644
--- a/README.mkd
+++ b/README.mkd
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/mitmproxy/mitmproxy.png)](https://travis-ci.org/mitmproxy/mitmproxy) [![Coverage Status](https://coveralls.io/repos/mitmproxy/mitmproxy/badge.png)](https://coveralls.io/r/mitmproxy/mitmproxy)
+
__mitmproxy__ is an interactive, SSL-capable man-in-the-middle proxy for HTTP
with a console interface.