better about closing session and teardown in tests

TiDeane · Nov 30, 2015 · 6ec3a70 · 6ec3a70
1 parent fb69b72
commit 6ec3a70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/airflow/contrib/auth/backends/password_auth.py b/airflow/contrib/auth/backends/password_auth.py
@@ -109,9 +109,11 @@ def login(self, request):
         user = session.query(PasswordUser).filter(
             PasswordUser.username == username).first()
         if not user:
+            session.close()
             raise AuthenticationError()
 
         if not user.authenticate(password):
+            session.close()
             raise AuthenticationError()
         LOG.info("User %s successfully authenticated", username)
 

diff --git a/tests/core.py b/tests/core.py
@@ -626,6 +626,10 @@ def test_unauthorized_password_auth(self):
 
     def tearDown(self):
         configuration.test_mode()
+        session = Session()
+        session.query(models.User).delete()
+        session.commit()
+        session.close()
         configuration.conf.set("webserver", "authenticate", "False")