diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_pathoc.py | 2 | ||||
| -rw-r--r-- | test/test_pathod_cmdline.py | 19 | ||||
| -rw-r--r-- | test/tutils.py | 2 |
3 files changed, 2 insertions, 21 deletions
diff --git a/test/test_pathoc.py b/test/test_pathoc.py index 28514378..e1e1fe97 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -23,7 +23,7 @@ class _TestDaemon: ssloptions = self.ssloptions, staticdir = tutils.test_data.path("data"), anchors = [ - (re.compile("/anchor/.*"), language.parse_pathod("202")) + (re.compile("/anchor/.*"), "202") ] ) diff --git a/test/test_pathod_cmdline.py b/test/test_pathod_cmdline.py index 590bb56b..829c4b32 100644 --- a/test/test_pathod_cmdline.py +++ b/test/test_pathod_cmdline.py @@ -65,15 +65,6 @@ def test_pathod(perror): assert perror.called perror.reset_mock() - s = cStringIO.StringIO() - tutils.raises( - SystemExit, - cmdline.args_pathod, - ["pathod", "-a", "foo=."], - s, - s - ) - a = cmdline.args_pathod( [ "pathod", @@ -92,13 +83,3 @@ def test_pathod(perror): ) assert perror.called perror.reset_mock() - - a = cmdline.args_pathod( - [ - "pathod", - "-c", - "?" - ] - ) - assert perror.called - perror.reset_mock() diff --git a/test/tutils.py b/test/tutils.py index c56c60d4..60c0765a 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -27,7 +27,7 @@ class DaemonTests(object): klass.d = test.Daemon( staticdir=test_data.path("data"), anchors=[ - (re.compile("/anchor/.*"), language.parse_pathod("202:da")) + (re.compile("/anchor/.*"), "202:da") ], ssl = klass.ssl, ssloptions = so, |