From a7522d9308a9592b0c79709f3d04cdd816ee1a57 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 2 Jun 2016 18:27:51 +1200 Subject: [PATCH] pathod.test shouldn't use the API at all --- pathod/test.py | 11 ----------- test/pathod/test_pathod.py | 9 +++++---- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pathod/test.py b/pathod/test.py index 0804951e7..28ade101e 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 9916984ec..0646d0115 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")