summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/tutorials/wiki/src/authorization/.gitignore2
-rw-r--r--docs/tutorials/wiki/src/authorization/tests/conftest.py21
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/views/auth.py1
-rw-r--r--docs/tutorials/wiki/src/basiclayout/.gitignore2
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tests/conftest.py21
-rw-r--r--docs/tutorials/wiki/src/installation/.gitignore2
-rw-r--r--docs/tutorials/wiki/src/installation/tests/conftest.py21
-rw-r--r--docs/tutorials/wiki/src/models/.gitignore2
-rw-r--r--docs/tutorials/wiki/src/models/tests/conftest.py21
-rw-r--r--docs/tutorials/wiki/src/views/.gitignore2
-rw-r--r--docs/tutorials/wiki/src/views/tests/conftest.py21
11 files changed, 96 insertions, 20 deletions
diff --git a/docs/tutorials/wiki/src/authorization/.gitignore b/docs/tutorials/wiki/src/authorization/.gitignore
index c612e59f2..e9336274d 100644
--- a/docs/tutorials/wiki/src/authorization/.gitignore
+++ b/docs/tutorials/wiki/src/authorization/.gitignore
@@ -11,7 +11,7 @@ dist/
nosetests.xml
env*/
tmp/
-Data.fs*
+Data*.fs*
*.sublime-project
*.sublime-workspace
.*.sw?
diff --git a/docs/tutorials/wiki/src/authorization/tests/conftest.py b/docs/tutorials/wiki/src/authorization/tests/conftest.py
index 12e75d8e9..6a702ae12 100644
--- a/docs/tutorials/wiki/src/authorization/tests/conftest.py
+++ b/docs/tutorials/wiki/src/authorization/tests/conftest.py
@@ -3,6 +3,7 @@ from pyramid.paster import get_appsettings
from pyramid.scripting import prepare
from pyramid.testing import DummyRequest
import pytest
+import transaction
import webtest
from tutorial import main
@@ -25,15 +26,27 @@ def app(app_settings):
return main({}, **app_settings)
@pytest.fixture
-def testapp(app):
+def tm():
+ tm = transaction.manager
+ tm.begin()
+ tm.doom()
+
+ yield tm
+
+ tm.abort()
+
+@pytest.fixture
+def testapp(app, tm):
testapp = webtest.TestApp(app, extra_environ={
'HTTP_HOST': 'example.com',
+ 'tm.active': True,
+ 'tm.manager': tm,
})
return testapp
@pytest.fixture
-def app_request(app):
+def app_request(app, tm):
"""
A real request.
@@ -44,12 +57,13 @@ def app_request(app):
env = prepare(registry=app.registry)
request = env['request']
request.host = 'example.com'
+ request.tm = tm
yield request
env['closer']()
@pytest.fixture
-def dummy_request(app):
+def dummy_request(app, tm):
"""
A lightweight dummy request.
@@ -65,5 +79,6 @@ def dummy_request(app):
request = DummyRequest()
request.registry = app.registry
request.host = 'example.com'
+ request.tm = tm
return request
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views/auth.py b/docs/tutorials/wiki/src/authorization/tutorial/views/auth.py
index cee3cc22b..5062779a6 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views/auth.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views/auth.py
@@ -30,6 +30,7 @@ def login(request):
headers = remember(request, login)
return HTTPSeeOther(location=came_from, headers=headers)
message = 'Failed login'
+ request.response.status = 400
return dict(
message=message,
diff --git a/docs/tutorials/wiki/src/basiclayout/.gitignore b/docs/tutorials/wiki/src/basiclayout/.gitignore
index c612e59f2..e9336274d 100644
--- a/docs/tutorials/wiki/src/basiclayout/.gitignore
+++ b/docs/tutorials/wiki/src/basiclayout/.gitignore
@@ -11,7 +11,7 @@ dist/
nosetests.xml
env*/
tmp/
-Data.fs*
+Data*.fs*
*.sublime-project
*.sublime-workspace
.*.sw?
diff --git a/docs/tutorials/wiki/src/basiclayout/tests/conftest.py b/docs/tutorials/wiki/src/basiclayout/tests/conftest.py
index 12e75d8e9..6a702ae12 100644
--- a/docs/tutorials/wiki/src/basiclayout/tests/conftest.py
+++ b/docs/tutorials/wiki/src/basiclayout/tests/conftest.py
@@ -3,6 +3,7 @@ from pyramid.paster import get_appsettings
from pyramid.scripting import prepare
from pyramid.testing import DummyRequest
import pytest
+import transaction
import webtest
from tutorial import main
@@ -25,15 +26,27 @@ def app(app_settings):
return main({}, **app_settings)
@pytest.fixture
-def testapp(app):
+def tm():
+ tm = transaction.manager
+ tm.begin()
+ tm.doom()
+
+ yield tm
+
+ tm.abort()
+
+@pytest.fixture
+def testapp(app, tm):
testapp = webtest.TestApp(app, extra_environ={
'HTTP_HOST': 'example.com',
+ 'tm.active': True,
+ 'tm.manager': tm,
})
return testapp
@pytest.fixture
-def app_request(app):
+def app_request(app, tm):
"""
A real request.
@@ -44,12 +57,13 @@ def app_request(app):
env = prepare(registry=app.registry)
request = env['request']
request.host = 'example.com'
+ request.tm = tm
yield request
env['closer']()
@pytest.fixture
-def dummy_request(app):
+def dummy_request(app, tm):
"""
A lightweight dummy request.
@@ -65,5 +79,6 @@ def dummy_request(app):
request = DummyRequest()
request.registry = app.registry
request.host = 'example.com'
+ request.tm = tm
return request
diff --git a/docs/tutorials/wiki/src/installation/.gitignore b/docs/tutorials/wiki/src/installation/.gitignore
index c612e59f2..e9336274d 100644
--- a/docs/tutorials/wiki/src/installation/.gitignore
+++ b/docs/tutorials/wiki/src/installation/.gitignore
@@ -11,7 +11,7 @@ dist/
nosetests.xml
env*/
tmp/
-Data.fs*
+Data*.fs*
*.sublime-project
*.sublime-workspace
.*.sw?
diff --git a/docs/tutorials/wiki/src/installation/tests/conftest.py b/docs/tutorials/wiki/src/installation/tests/conftest.py
index 12e75d8e9..6a702ae12 100644
--- a/docs/tutorials/wiki/src/installation/tests/conftest.py
+++ b/docs/tutorials/wiki/src/installation/tests/conftest.py
@@ -3,6 +3,7 @@ from pyramid.paster import get_appsettings
from pyramid.scripting import prepare
from pyramid.testing import DummyRequest
import pytest
+import transaction
import webtest
from tutorial import main
@@ -25,15 +26,27 @@ def app(app_settings):
return main({}, **app_settings)
@pytest.fixture
-def testapp(app):
+def tm():
+ tm = transaction.manager
+ tm.begin()
+ tm.doom()
+
+ yield tm
+
+ tm.abort()
+
+@pytest.fixture
+def testapp(app, tm):
testapp = webtest.TestApp(app, extra_environ={
'HTTP_HOST': 'example.com',
+ 'tm.active': True,
+ 'tm.manager': tm,
})
return testapp
@pytest.fixture
-def app_request(app):
+def app_request(app, tm):
"""
A real request.
@@ -44,12 +57,13 @@ def app_request(app):
env = prepare(registry=app.registry)
request = env['request']
request.host = 'example.com'
+ request.tm = tm
yield request
env['closer']()
@pytest.fixture
-def dummy_request(app):
+def dummy_request(app, tm):
"""
A lightweight dummy request.
@@ -65,5 +79,6 @@ def dummy_request(app):
request = DummyRequest()
request.registry = app.registry
request.host = 'example.com'
+ request.tm = tm
return request
diff --git a/docs/tutorials/wiki/src/models/.gitignore b/docs/tutorials/wiki/src/models/.gitignore
index c612e59f2..e9336274d 100644
--- a/docs/tutorials/wiki/src/models/.gitignore
+++ b/docs/tutorials/wiki/src/models/.gitignore
@@ -11,7 +11,7 @@ dist/
nosetests.xml
env*/
tmp/
-Data.fs*
+Data*.fs*
*.sublime-project
*.sublime-workspace
.*.sw?
diff --git a/docs/tutorials/wiki/src/models/tests/conftest.py b/docs/tutorials/wiki/src/models/tests/conftest.py
index 12e75d8e9..6a702ae12 100644
--- a/docs/tutorials/wiki/src/models/tests/conftest.py
+++ b/docs/tutorials/wiki/src/models/tests/conftest.py
@@ -3,6 +3,7 @@ from pyramid.paster import get_appsettings
from pyramid.scripting import prepare
from pyramid.testing import DummyRequest
import pytest
+import transaction
import webtest
from tutorial import main
@@ -25,15 +26,27 @@ def app(app_settings):
return main({}, **app_settings)
@pytest.fixture
-def testapp(app):
+def tm():
+ tm = transaction.manager
+ tm.begin()
+ tm.doom()
+
+ yield tm
+
+ tm.abort()
+
+@pytest.fixture
+def testapp(app, tm):
testapp = webtest.TestApp(app, extra_environ={
'HTTP_HOST': 'example.com',
+ 'tm.active': True,
+ 'tm.manager': tm,
})
return testapp
@pytest.fixture
-def app_request(app):
+def app_request(app, tm):
"""
A real request.
@@ -44,12 +57,13 @@ def app_request(app):
env = prepare(registry=app.registry)
request = env['request']
request.host = 'example.com'
+ request.tm = tm
yield request
env['closer']()
@pytest.fixture
-def dummy_request(app):
+def dummy_request(app, tm):
"""
A lightweight dummy request.
@@ -65,5 +79,6 @@ def dummy_request(app):
request = DummyRequest()
request.registry = app.registry
request.host = 'example.com'
+ request.tm = tm
return request
diff --git a/docs/tutorials/wiki/src/views/.gitignore b/docs/tutorials/wiki/src/views/.gitignore
index c612e59f2..e9336274d 100644
--- a/docs/tutorials/wiki/src/views/.gitignore
+++ b/docs/tutorials/wiki/src/views/.gitignore
@@ -11,7 +11,7 @@ dist/
nosetests.xml
env*/
tmp/
-Data.fs*
+Data*.fs*
*.sublime-project
*.sublime-workspace
.*.sw?
diff --git a/docs/tutorials/wiki/src/views/tests/conftest.py b/docs/tutorials/wiki/src/views/tests/conftest.py
index 12e75d8e9..6a702ae12 100644
--- a/docs/tutorials/wiki/src/views/tests/conftest.py
+++ b/docs/tutorials/wiki/src/views/tests/conftest.py
@@ -3,6 +3,7 @@ from pyramid.paster import get_appsettings
from pyramid.scripting import prepare
from pyramid.testing import DummyRequest
import pytest
+import transaction
import webtest
from tutorial import main
@@ -25,15 +26,27 @@ def app(app_settings):
return main({}, **app_settings)
@pytest.fixture
-def testapp(app):
+def tm():
+ tm = transaction.manager
+ tm.begin()
+ tm.doom()
+
+ yield tm
+
+ tm.abort()
+
+@pytest.fixture
+def testapp(app, tm):
testapp = webtest.TestApp(app, extra_environ={
'HTTP_HOST': 'example.com',
+ 'tm.active': True,
+ 'tm.manager': tm,
})
return testapp
@pytest.fixture
-def app_request(app):
+def app_request(app, tm):
"""
A real request.
@@ -44,12 +57,13 @@ def app_request(app):
env = prepare(registry=app.registry)
request = env['request']
request.host = 'example.com'
+ request.tm = tm
yield request
env['closer']()
@pytest.fixture
-def dummy_request(app):
+def dummy_request(app, tm):
"""
A lightweight dummy request.
@@ -65,5 +79,6 @@ def dummy_request(app):
request = DummyRequest()
request.registry = app.registry
request.host = 'example.com'
+ request.tm = tm
return request
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-11 16:07:59 +0000