diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-02 18:27:51 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-02 18:27:51 +1200 |
| commit | a7522d9308a9592b0c79709f3d04cdd816ee1a57 (patch) | |
| tree | d3807fb049865ab954d6f7b2d1c4a27856dd6bdd | |
| parent | 254614e9f77e108d186ff3f7e89ec78012af65a1 (diff) | |
| download | mitmproxy-a7522d9308a9592b0c79709f3d04cdd816ee1a57.tar.gz mitmproxy-a7522d9308a9592b0c79709f3d04cdd816ee1a57.tar.bz2 mitmproxy-a7522d9308a9592b0c79709f3d04cdd816ee1a57.zip | |
pathod.test shouldn't use the API at all
| -rw-r--r-- | pathod/test.py | 11 | ||||
| -rw-r--r-- | test/pathod/test_pathod.py | 9 |
2 files changed, 5 insertions, 15 deletions
diff --git a/pathod/test.py b/pathod/test.py index 0804951e..28ade101 100644 --- a/pathod/test.py +++ b/pathod/test.py @@ -4,12 +4,8 @@ import time from six.moves import queue -import requests -import requests.packages.urllib3 from . import pathod -requests.packages.urllib3.disable_warnings() - class Daemon: IFACE = "127.0.0.1" @@ -41,13 +37,6 @@ class Daemon: """ return "%s/p/%s" % (self.urlbase, spec) - def info(self): - """ - Return some basic info about the remote daemon. - """ - resp = requests.get("%s/api/info" % self.urlbase, verify=False) - return resp.json() - def text_log(self): return self.logfp.getvalue() diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py index 9916984e..0646d011 100644 --- a/test/pathod/test_pathod.py +++ b/test/pathod/test_pathod.py @@ -1,11 +1,15 @@ from six.moves import cStringIO as StringIO -from pathod import pathod, version +from pathod import pathod from netlib import tcp from netlib.exceptions import HttpException, TlsException import tutils +import requests.packages.urllib3 +requests.packages.urllib3.disable_warnings() + + class TestPathod(object): def test_logging(self): @@ -138,9 +142,6 @@ class CommonTests(tutils.DaemonTests): r, _ = self.pathoc([r"get:'/p/200':i0,'\r\n'"]) assert r[0].status_code == 200 - def test_info(self): - assert tuple(self.d.info()["version"]) == version.IVERSION - def test_logs(self): self.d.clear_log() assert self.get("202:da") |