Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Configure Pyramid registry only once across a test session, instead of once for each test #1407

Merged
merged 1 commit into from
May 16, 2024
Merged

Configure Pyramid registry only once across a test session, instead of once for each test #1407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions weasyl/test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,29 @@ def empty_storage():
shutil.rmtree(macro.MACRO_STORAGE_ROOT)


@pytest.fixture(scope="session")
def configurator():
config = pyramid.testing.setUp()
setup_routes_and_views(config)

try:
yield config
finally:
pyramid.testing.tearDown()


@pytest.fixture(autouse=True)
def setup_request_environment(request):
def setup_request_environment(request, configurator):
pyramid_request = pyramid.testing.DummyRequest()
pyramid_request.set_property(middleware.pg_connection_request_property, name='pg_connection', reify=True)
pyramid_request.set_property(middleware.userid_request_property, name='userid', reify=True)
pyramid_request.web_input = middleware.web_input_request_method
pyramid_request.environ['HTTP_X_FORWARDED_FOR'] = '127.0.0.1'
pyramid_request.client_addr = '127.0.0.1'
setup_routes_and_views(pyramid.testing.setUp(request=pyramid_request))
configurator.begin(request=pyramid_request)

def tear_down():
pyramid_request.pg_connection.close()
pyramid.testing.tearDown()

request.addfinalizer(tear_down)

Expand Down
Loading