Fix database fixture and password unit test (#1120)

OpenOversight/tests/conftest.py

@@ -300,30 +300,27 @@ def db(app):
     with app.app_context():
         _db.app = app
         _db.create_all()
-        connection = _db.engine.connect()
-        session = scoped_session(session_factory=sessionmaker(bind=connection))
-        _db.session = session
-        add_mockdata(session)
-        session.commit()
-        connection.close()
-        session.remove()
+        with _db.engine.begin() as connection:
+            _db.session = scoped_session(sessionmaker(bind=connection))
+            add_mockdata(_db.session)
+            _db.session.remove()
 
         yield _db
 
 
 @pytest.fixture(scope="function")
 def session(db):
     """Creates a new database session for a test."""
-    with db.engine.connect() as connection:
-        with connection.begin():
-            session = scoped_session(session_factory=sessionmaker(bind=connection))
-            db.session = session
-
-            try:
-                yield session
-            finally:
-                session.remove()
-                connection.close()
+    with db.engine.connect() as connection, connection.begin() as tx:
+        db.session = scoped_session(sessionmaker(bind=connection))
+
+        try:
+            yield db.session
+        finally:
+            db.session.remove()
+            # If an error was raised during test, tx is already rolled back
+            if tx.is_active:
+                tx.rollback()
 
 
 @pytest.fixture

OpenOversight/tests/test_models.py

@@ -173,11 +173,8 @@ def test_salary_repr(mockdata):
 def test_password_not_printed(mockdata):
     """Validate that password fields cannot be directly accessed."""
     user = User(password="bacon")
-    try:
+    with raises(AttributeError):
         print(user.password)
-    except Exception as e:
-        assert isinstance(e, AttributeError)
-        assert str(e) == "password is not a readable attribute"
 
 
 def test_password_set_success(mockdata):