conftest change to backport, session_factory -> sqlite_session_factory

Author: hjwp

tests/conftest.py

@@ -18,24 +18,19 @@
 
 
 @pytest.fixture
-def in_memory_db():
+def in_memory_sqlite_db():
     engine = create_engine("sqlite:///:memory:")
     metadata.create_all(engine)
     return engine
 
 
 @pytest.fixture
-def sqlite_session_factory(in_memory_db):
+def sqlite_session_factory(in_memory_sqlite_db):
     start_mappers()
-    yield sessionmaker(bind=in_memory_db)
+    yield sessionmaker(bind=in_memory_sqlite_db)
     clear_mappers()
 
 
-@pytest.fixture
-def sqlite_session(sqlite_session_factory):
-    return sqlite_session_factory()
-
-
 @retry(stop=stop_after_delay(10))
 def wait_for_postgres_to_come_up(engine):
     return engine.connect()

tests/integration/test_repository.py

@@ -2,8 +2,9 @@
 from allocation.domain import model
 
 
-def test_get_by_batchref(sqlite_session):
-    repo = repository.SqlAlchemyRepository(sqlite_session)
+def test_get_by_batchref(sqlite_session_factory):
+    session = sqlite_session_factory()
+    repo = repository.SqlAlchemyRepository(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)