fix unittests in wiki2 to work without deps on py2 and py3

fixes #2882

2 files changed, 12 insertions, 14 deletions

diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_initdb.py b/docs/tutorials/wiki2/src/tests/tutorial/tests/test_initdb.py
index 97511d5e8..f5273456e 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_initdb.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/tests/test_initdb.py
@@ -1,20 +1,16 @@
-import mock
+import os
 import unittest
 
 
 class TestInitializeDB(unittest.TestCase):
 
-    @mock.patch('tutorial.scripts.initializedb.sys')
-    def test_usage(self, mocked_sys):
+    def test_usage(self):
         from ..scripts.initializedb import main
-        main(argv=['foo'])
-        mocked_sys.exit.assert_called_with(1)
+        with self.assertRaises(SystemExit):
+            main(argv=['foo'])
 
-    @mock.patch('tutorial.scripts.initializedb.get_tm_session')
-    @mock.patch('tutorial.scripts.initializedb.sys')
-    def test_run(self, mocked_sys, mocked_session):
+    def test_run(self):
         from ..scripts.initializedb import main
         main(argv=['foo', 'development.ini'])
-        mocked_session.assert_called_once()
-
-
+        self.assertTrue(os.path.exists('tutorial.sqlite'))
+        os.remove('tutorial.sqlite')
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_security.py b/docs/tutorials/wiki2/src/tests/tutorial/tests/test_security.py
index 4c3b72946..cbec6420d 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/tests/test_security.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/tests/test_security.py
@@ -1,11 +1,11 @@
-import mock
 import unittest
+from pyramid.testing import DummyRequest
 
 
 class TestMyAuthenticationPolicy(unittest.TestCase):
 
     def test_no_user(self):
-        request = mock.Mock()
+        request = DummyRequest()
         request.user = None
 
         from ..security import MyAuthenticationPolicy
@@ -13,7 +13,9 @@ class TestMyAuthenticationPolicy(unittest.TestCase):
         self.assertEqual(policy.authenticated_userid(request), None)
 
     def test_authenticated_user(self):
-        request = mock.Mock()
+        from ..models import User
+        request = DummyRequest()
+        request.user = User()
         request.user.id = 'foo'
 
         from ..security import MyAuthenticationPolicy