summaryrefslogtreecommitdiff
path: root/pecan/tests/test_hooks.py
diff options
context:
space:
mode:
Diffstat (limited to 'pecan/tests/test_hooks.py')
-rw-r--r--pecan/tests/test_hooks.py55
1 files changed, 27 insertions, 28 deletions
diff --git a/pecan/tests/test_hooks.py b/pecan/tests/test_hooks.py
index 8e103b2..66947ca 100644
--- a/pecan/tests/test_hooks.py
+++ b/pecan/tests/test_hooks.py
@@ -1,9 +1,8 @@
-from cStringIO import StringIO
-
from webtest import TestApp
+from six import b as b_
+from six.moves import cStringIO as StringIO
from pecan import make_app, expose, redirect, abort
-from pecan.core import state
from pecan.hooks import (
PecanHook, TransactionHook, HookController, RequestViewerHook
)
@@ -39,7 +38,7 @@ class TestHooks(PecanTestCase):
app = TestApp(make_app(RootController(), hooks=[SimpleHook()]))
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 4
assert run_hook[0] == 'on_route'
@@ -77,7 +76,7 @@ class TestHooks(PecanTestCase):
]))
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 10
assert run_hook[0] == 'on_route1'
@@ -118,7 +117,7 @@ class TestHooks(PecanTestCase):
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello World!'
+ assert response.body == b_('Hello World!')
assert len(run_hook) == 2
assert run_hook[0] == 'on_route'
@@ -127,7 +126,7 @@ class TestHooks(PecanTestCase):
run_hook = []
try:
response = app.get('/causeerror')
- except Exception, e:
+ except Exception as e:
assert isinstance(e, IndexError)
assert len(run_hook) == 2
@@ -167,7 +166,7 @@ class TestHooks(PecanTestCase):
app = TestApp(papp)
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 10
assert run_hook[0] == 'on_route3'
@@ -224,7 +223,7 @@ class TestHooks(PecanTestCase):
app = TestApp(make_app(RootController()))
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 1
assert run_hook[0] == 'inside'
@@ -233,7 +232,7 @@ class TestHooks(PecanTestCase):
response = app.get('/sub/')
assert response.status_int == 200
- assert response.body == 'Inside here!'
+ assert response.body == b_('Inside here!')
assert len(run_hook) == 3
assert run_hook[0] == 'before'
@@ -243,7 +242,7 @@ class TestHooks(PecanTestCase):
run_hook = []
response = app.get('/sub/sub/')
assert response.status_int == 200
- assert response.body == 'Deep inside here!'
+ assert response.body == b_('Deep inside here!')
assert len(run_hook) == 3
assert run_hook[0] == 'before'
@@ -288,7 +287,7 @@ class TestHooks(PecanTestCase):
app = TestApp(make_app(RootController(), hooks=[SimpleHook(1)]))
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 4
assert run_hook[0] == 'on_route1'
@@ -300,7 +299,7 @@ class TestHooks(PecanTestCase):
response = app.get('/sub/')
assert response.status_int == 200
- assert response.body == 'Inside here!'
+ assert response.body == b_('Inside here!')
assert len(run_hook) == 6
assert run_hook[0] == 'on_route1'
@@ -344,7 +343,7 @@ class TestTransactionHook(PecanTestCase):
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 3
assert run_hook[0] == 'start_ro'
@@ -355,7 +354,7 @@ class TestTransactionHook(PecanTestCase):
response = app.post('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 4
assert run_hook[0] == 'start'
@@ -450,7 +449,7 @@ class TestTransactionHook(PecanTestCase):
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Index Method!'
+ assert response.body == b_('Index Method!')
assert len(run_hook) == 3
assert run_hook[0] == 'start_ro'
@@ -461,7 +460,7 @@ class TestTransactionHook(PecanTestCase):
response = app.post('/')
assert response.status_int == 200
- assert response.body == 'Index Method!'
+ assert response.body == b_('Index Method!')
assert len(run_hook) == 5
assert run_hook[0] == 'start'
@@ -474,7 +473,7 @@ class TestTransactionHook(PecanTestCase):
response = app.get('/decorated')
assert response.status_int == 200
- assert response.body == 'Decorated Method!'
+ assert response.body == b_('Decorated Method!')
assert len(run_hook) == 7
assert run_hook[0] == 'start_ro'
@@ -579,7 +578,7 @@ class TestTransactionHook(PecanTestCase):
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 3
assert run_hook[0] == 'start_ro'
@@ -592,7 +591,7 @@ class TestTransactionHook(PecanTestCase):
response = app.post('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 4
assert run_hook[0] == 'start'
@@ -822,7 +821,7 @@ class TestTransactionHook(PecanTestCase):
response = app.get('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 6
assert run_hook[0] == 'start_ro'
@@ -838,7 +837,7 @@ class TestTransactionHook(PecanTestCase):
response = app.post('/')
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert len(run_hook) == 4
assert run_hook[0] == 'start'
@@ -947,7 +946,7 @@ class TestTransactionHook(PecanTestCase):
response = app.get('/generic')
assert response.status_int == 200
- assert response.body == 'generic get'
+ assert response.body == b_('generic get')
assert len(run_hook) == 6
assert run_hook[0] == 'start_ro'
assert run_hook[1] == 'clear'
@@ -965,7 +964,7 @@ class TestTransactionHook(PecanTestCase):
response = app.post('/generic')
assert response.status_int == 200
- assert response.body == 'generic post'
+ assert response.body == b_('generic post')
assert len(run_hook) == 4
assert run_hook[0] == 'start'
assert run_hook[1] == 'inside'
@@ -1052,7 +1051,7 @@ class TestRequestViewerHook(PecanTestCase):
out = _stdout.getvalue()
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert 'path' in out
assert 'method' in out
assert 'status' in out
@@ -1117,7 +1116,7 @@ class TestRequestViewerHook(PecanTestCase):
out = _stdout.getvalue()
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert '/' in out
assert 'path' in out
assert 'method' not in out
@@ -1152,7 +1151,7 @@ class TestRequestViewerHook(PecanTestCase):
out = _stdout.getvalue()
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert out == ''
def test_item_not_in_defaults(self):
@@ -1179,7 +1178,7 @@ class TestRequestViewerHook(PecanTestCase):
out = _stdout.getvalue()
assert response.status_int == 200
- assert response.body == 'Hello, World!'
+ assert response.body == b_('Hello, World!')
assert 'date' in out
assert 'method' not in out
assert 'status' not in out