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

Remove transaction.rollback() and use session fixture #1117

Merged
merged 10 commits into from
Jul 29, 2024
Merged

Remove transaction.rollback() and use session fixture #1117

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f5da031
Update conftest.py
michplunkett Jul 24, 2024
1e8932f
Update test_models.py
michplunkett Jul 24, 2024
fe8c5f4
Update test_user_api.py
michplunkett Jul 24, 2024
94da1a2
Update test_functional.py
michplunkett Jul 24, 2024
d981882
Update test_descriptions.py
michplunkett Jul 24, 2024
9f2e12c
Update test_notes.py
michplunkett Jul 24, 2024
bbcac92
Update conftest.py
michplunkett Jul 24, 2024
de1a98e
Update conftest.py
michplunkett Jul 24, 2024
c1d5e1c
Update database relationship diagram
michplunkett Jul 24, 2024
0aabc83
Update conftest.py
michplunkett Jul 29, 2024
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
Next Next commit
Update conftest.py
  • Loading branch information
@michplunkett
michplunkett committed Jul 24, 2024
commit f5da031ef0a7fa0cd9e484c63034fff8abf49bf0
11 changes: 6 additions & 5 deletions OpenOversight/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,12 @@ def session(db):
session = scoped_session(session_factory=sessionmaker(bind=connection))
db.session = session

yield session

transaction.rollback()
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The transaction.rollback() function call here was redundant. SQLAlchemy was already taking care of it for any of the tests that needed it (i.e., test__uuid_uniqueness_constraint, test_redirect_add_salary, test_add_department__duplicate).

connection.close()
session.remove()
try:
yield session
finally:
session.remove()
transaction.rollback()
connection.close()


@pytest.fixture
Expand Down