session_factory -> sqlite_session_factory (needs backport)

hjwp · hjwp · commit 3a55cde57ba2 · 2021-02-24T20:08:31.000Z
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -25,15 +25,15 @@ def in_memory_db():
 
 
 @pytest.fixture
-def session_factory(in_memory_db):
+def sqlite_session_factory(in_memory_db):
     start_mappers()
     yield sessionmaker(bind=in_memory_db)
     clear_mappers()
 
 
 @pytest.fixture
-def session(session_factory):
-    return session_factory()
+def sqlite_session(sqlite_session_factory):
+    return sqlite_session_factory()
 
 
 @retry(stop=stop_after_delay(10))
diff --git a/tests/integration/test_repository.py b/tests/integration/test_repository.py
@@ -2,8 +2,8 @@
 from allocation.domain import model
 
 
-def test_get_by_batchref(session):
-    repo = repository.SqlAlchemyRepository(session)
+def test_get_by_batchref(sqlite_session):
+    repo = repository.SqlAlchemyRepository(sqlite_session)
     b1 = model.Batch(ref="b1", sku="sku1", qty=100, eta=None)
     b2 = model.Batch(ref="b2", sku="sku1", qty=100, eta=None)
     b3 = model.Batch(ref="b3", sku="sku2", qty=100, eta=None)
diff --git a/tests/integration/test_uow.py b/tests/integration/test_uow.py
@@ -34,12 +34,12 @@ def get_allocated_batch_ref(session, orderid, sku):
     return batchref
 
 
-def test_uow_can_retrieve_a_batch_and_allocate_to_it(session_factory):
-    session = session_factory()
+def test_uow_can_retrieve_a_batch_and_allocate_to_it(sqlite_session_factory):
+    session = sqlite_session_factory()
     insert_batch(session, "batch1", "HIPSTER-WORKBENCH", 100, None)
     session.commit()
 
-    uow = unit_of_work.SqlAlchemyUnitOfWork(session_factory)
+    uow = unit_of_work.SqlAlchemyUnitOfWork(sqlite_session_factory)
     with uow:
         product = uow.products.get(sku="HIPSTER-WORKBENCH")
         line = model.OrderLine("o1", "HIPSTER-WORKBENCH", 10)
@@ -50,27 +50,27 @@ def test_uow_can_retrieve_a_batch_and_allocate_to_it(session_factory):
     assert batchref == "batch1"
 
 
-def test_rolls_back_uncommitted_work_by_default(session_factory):
-    uow = unit_of_work.SqlAlchemyUnitOfWork(session_factory)
+def test_rolls_back_uncommitted_work_by_default(sqlite_session_factory):
+    uow = unit_of_work.SqlAlchemyUnitOfWork(sqlite_session_factory)
     with uow:
         insert_batch(uow.session, "batch1", "MEDIUM-PLINTH", 100, None)
 
-    new_session = session_factory()
+    new_session = sqlite_session_factory()
     rows = list(new_session.execute('SELECT * FROM "batches"'))
     assert rows == []
 
 
-def test_rolls_back_on_error(session_factory):
+def test_rolls_back_on_error(sqlite_session_factory):
     class MyException(Exception):
         pass
 
-    uow = unit_of_work.SqlAlchemyUnitOfWork(session_factory)
+    uow = unit_of_work.SqlAlchemyUnitOfWork(sqlite_session_factory)
     with pytest.raises(MyException):
         with uow:
             insert_batch(uow.session, "batch1", "LARGE-FORK", 100, None)
             raise MyException()
 
-    new_session = session_factory()
+    new_session = sqlite_session_factory()
     rows = list(new_session.execute('SELECT * FROM "batches"'))
     assert rows == []
 
