diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-11-11 12:29:34 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-11-11 12:29:34 +0100 |
commit | 8635e00175117d8574b4bea5edc1c43528ddf3e9 (patch) | |
tree | 1be23a6349a8fb81a89f8417b0b9d236d1829639 /test/test_app.py | |
parent | b917b61e6aead4f353ef15838315ecc0df721e29 (diff) | |
parent | 27c7e9e9345bbc458e7efc4093c2074e19011d12 (diff) | |
download | mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.tar.gz mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.tar.bz2 mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
setup.py
Diffstat (limited to 'test/test_app.py')
-rw-r--r-- | test/test_app.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_app.py b/test/test_app.py index f35def00..7c7ac730 100644 --- a/test/test_app.py +++ b/test/test_app.py @@ -1,7 +1,9 @@ import tutils + class TestApp(tutils.DaemonTests): SSL = False + def test_index(self): r = self.getpath("/") assert r.status_code == 200 @@ -78,4 +80,3 @@ class TestApp(tutils.DaemonTests): r = self.getpath("/request_preview", params=dict(spec="")) assert r.status_code == 200 assert 'empty spec' in r.content - |