diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-04-17 15:27:50 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-04-17 15:27:50 +1200 |
| commit | fe8e27f27b7a5ead1a7f60df1516d5fef161e776 (patch) | |
| tree | d378b5488b7530a75ca10957477a8c1ae379c10a | |
| parent | 09e995ab5c78b8bd098e1330df7aa40972e0b1bb (diff) | |
| download | mitmproxy-fe8e27f27b7a5ead1a7f60df1516d5fef161e776.tar.gz mitmproxy-fe8e27f27b7a5ead1a7f60df1516d5fef161e776.tar.bz2 mitmproxy-fe8e27f27b7a5ead1a7f60df1516d5fef161e776.zip | |
Housekeeping: .env and fix unit tests
| -rw-r--r-- | .env | 5 | ||||
| -rw-r--r-- | test/test_pathod.py | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -0,0 +1,5 @@ +DIR=`dirname $0` +if [ -z "$VIRTUAL_ENV" ] && [ -f $DIR/../venv.mitmproxy/bin/activate ]; then + echo "Activating mitmproxy virtualenv..." + source $DIR/../venv.mitmproxy/bin/activate +fi diff --git a/test/test_pathod.py b/test/test_pathod.py index 8b37b545..e90547bc 100644 --- a/test/test_pathod.py +++ b/test/test_pathod.py @@ -32,7 +32,7 @@ class TestTimeout(tutils.DaemonTests): def test_noweb(self): # FIXME: Add float values to spec language, reduce test timeout to # increase test performance - tutils.raises("server disconnect", self.pathoc, "get:/:p1,1") + tutils.raises(tcp.NetLibDisconnect, self.pathoc, "get:/:p1,1") assert self.d.last_log()["type"] == "timeout" |