diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-06-09 15:08:51 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-06-09 15:08:51 +1200 |
| commit | 00c8bef0ff21794e622b7f442408e29c644b7002 (patch) | |
| tree | fe016e005c73f7403a7a94f6ac8cc606cb838040 /test/test_test.py | |
| parent | 456b11df9a571e7f72570df1c5f6b4a59fd02c11 (diff) | |
| download | mitmproxy-00c8bef0ff21794e622b7f442408e29c644b7002.tar.gz mitmproxy-00c8bef0ff21794e622b7f442408e29c644b7002.tar.bz2 mitmproxy-00c8bef0ff21794e622b7f442408e29c644b7002.zip | |
Port test suite over to Nose.
Diffstat (limited to 'test/test_test.py')
| -rw-r--r-- | test/test_test.py | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/test/test_test.py b/test/test_test.py index 086f3dfc..53decd1c 100644 --- a/test/test_test.py +++ b/test/test_test.py @@ -1,18 +1,18 @@ import time, logging -import libpry import requests from libpathod import test, version, utils +import tutils logging.disable(logging.CRITICAL) -class uDaemonManual(libpry.AutoTree): +class TestDaemonManual: def test_startstop(self): d = test.Daemon() rsp = requests.get("http://localhost:%s/p/202"%d.port) assert rsp.ok assert rsp.status_code == 202 d.shutdown() - libpry.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202"%d.port) + tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202"%d.port) def test_startstop_ssl(self): d = test.Daemon(ssl=True) @@ -20,7 +20,7 @@ class uDaemonManual(libpry.AutoTree): assert rsp.ok assert rsp.status_code == 202 d.shutdown() - libpry.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202"%d.port) + tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202"%d.port) def test_startstop_ssl_explicit(self): ssloptions = dict( @@ -32,22 +32,18 @@ class uDaemonManual(libpry.AutoTree): assert rsp.ok assert rsp.status_code == 202 d.shutdown() - libpry.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202"%d.port) + tutils.raises(requests.ConnectionError, requests.get, "http://localhost:%s/p/202"%d.port) -class uDaemon(libpry.AutoTree): +class TestDaemon: + @classmethod def setUpAll(self): self.d = test.Daemon() + @classmethod def tearDownAll(self): self.d.shutdown() def test_info(self): assert tuple(self.d.info()["version"]) == version.IVERSION - - -tests = [ - uDaemonManual(), - uDaemon() -] |