Housekeeping: .env and fix unit tests

This commit is contained in:
Aldo Cortesi 2015-04-17 15:27:50 +12:00
parent 09e995ab5c
commit fe8e27f27b
2 changed files with 6 additions and 1 deletions

5
.env Normal file
View File

@ -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

View File

@ -32,7 +32,7 @@ class TestTimeout(tutils.DaemonTests):
def test_noweb(self): def test_noweb(self):
# FIXME: Add float values to spec language, reduce test timeout to # FIXME: Add float values to spec language, reduce test timeout to
# increase test performance # 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" assert self.d.last_log()["type"] == "timeout"