summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-14 16:08:02 +0200
committerChris McDonough <chrism@plope.com>2013-10-14 16:08:02 +0200
commitf23f38db37e8e323512424e5715a40dc2dce9ab8 (patch)
treea492a2724c2705aef5ace2f88d1d5501583eaa37 /docs/tutorials
parentcd218d2934c87260bbb10620e3b419b275fe6244 (diff)
downloadpyramid-f23f38db37e8e323512424e5715a40dc2dce9ab8.tar.gz
pyramid-f23f38db37e8e323512424e5715a40dc2dce9ab8.tar.bz2
pyramid-f23f38db37e8e323512424e5715a40dc2dce9ab8.zip
Revert "make these tests pass on python 3.2+"
This reverts commit cd218d2934c87260bbb10620e3b419b275fe6244.
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/src/tests/tutorial/tests.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py
index 5add04c20..c435a4519 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py
@@ -158,11 +158,11 @@ class FunctionalTests(unittest.TestCase):
def test_FrontPage(self):
res = self.testapp.get('/FrontPage', status=200)
- self.assertTrue(b'FrontPage' in res.body)
+ self.assertTrue('FrontPage' in res.body)
def test_unexisting_page(self):
res = self.testapp.get('/SomePage', status=404)
- self.assertTrue(b'Not Found' in res.body)
+ self.assertTrue('Not Found' in res.body)
def test_successful_log_in(self):
res = self.testapp.get( self.viewer_login, status=302)
@@ -170,48 +170,48 @@ class FunctionalTests(unittest.TestCase):
def test_failed_log_in(self):
res = self.testapp.get( self.viewer_wrong_login, status=200)
- self.assertTrue(b'login' in res.body)
+ self.assertTrue('login' in res.body)
def test_logout_link_present_when_logged_in(self):
res = self.testapp.get( self.viewer_login, status=302)
res = self.testapp.get('/FrontPage', status=200)
- self.assertTrue(b'Logout' in res.body)
+ self.assertTrue('Logout' in res.body)
def test_logout_link_not_present_after_logged_out(self):
res = self.testapp.get( self.viewer_login, status=302)
res = self.testapp.get('/FrontPage', status=200)
res = self.testapp.get('/logout', status=302)
- self.assertTrue(b'Logout' not in res.body)
+ self.assertTrue('Logout' not in res.body)
def test_anonymous_user_cannot_edit(self):
res = self.testapp.get('/FrontPage/edit_page', status=200)
- self.assertTrue(b'Login' in res.body)
+ self.assertTrue('Login' in res.body)
def test_anonymous_user_cannot_add(self):
res = self.testapp.get('/add_page/NewPage', status=200)
- self.assertTrue(b'Login' in res.body)
+ self.assertTrue('Login' in res.body)
def test_viewer_user_cannot_edit(self):
res = self.testapp.get( self.viewer_login, status=302)
res = self.testapp.get('/FrontPage/edit_page', status=200)
- self.assertTrue(b'Login' in res.body)
+ self.assertTrue('Login' in res.body)
def test_viewer_user_cannot_add(self):
res = self.testapp.get( self.viewer_login, status=302)
res = self.testapp.get('/add_page/NewPage', status=200)
- self.assertTrue(b'Login' in res.body)
+ self.assertTrue('Login' in res.body)
def test_editors_member_user_can_edit(self):
res = self.testapp.get( self.editor_login, status=302)
res = self.testapp.get('/FrontPage/edit_page', status=200)
- self.assertTrue(b'Editing' in res.body)
+ self.assertTrue('Editing' in res.body)
def test_editors_member_user_can_add(self):
res = self.testapp.get( self.editor_login, status=302)
res = self.testapp.get('/add_page/NewPage', status=200)
- self.assertTrue(b'Editing' in res.body)
+ self.assertTrue('Editing' in res.body)
def test_editors_member_user_can_view(self):
res = self.testapp.get( self.editor_login, status=302)
res = self.testapp.get('/FrontPage', status=200)
- self.assertTrue(b'FrontPage' in res.body)
+ self.assertTrue('FrontPage' in res.body)