fix main test

Author: nolan1999

tests/integration/conftest.py

@@ -287,12 +287,11 @@ def db_session(db: Database) -> Generator[Session, None, None]:
 
 
 @pytest.fixture
-def jobs(
+def job_defs(
     test_username: str,
     test_user_email: str,
     application: dict[str, str],
     job_attrs: dict[str, Any],
-    db_session: Session,
 ) -> list[Job]:
     job1 = Job(
         id=42,
@@ -316,10 +315,14 @@ def jobs(
         hardware={},
         paths_out={"output": "out", "log": "log", "artifact": "model"},
     )
-    for job in [job1, job2]:
+    return [job1, job2]
+
+
+def jobs(job_defs: list[Job], db_session: Session) -> list[Job]:
+    for job in job_defs:
         db_session.add(job)
     db_session.commit()
-    return [job1, job2]
+    return job_defs
 
 
 @pytest.fixture

tests/integration/test_main.py

@@ -57,7 +57,7 @@ def get_backup_nrows(self, s3_testing_bucket: S3TestingBucket) -> int:
     def test_sqlite_backup(
         self,
         db: SqliteDatabase,
-        jobs: list[Job],
+        job_defs: list[Job],
         client: TestClient,
         s3_testing_bucket: S3TestingBucket,
         tmpdir_factory: pytest.TempdirFactory,
@@ -75,14 +75,14 @@ def test_sqlite_backup(
 
             # Enqueue a job and verify it's backed up
             with Session(db.engine) as session:
-                session.add(jobs[0])
+                session.add(job_defs[0])
                 session.commit()
             time.sleep(2)  # wait for backup to run
             assert self.get_backup_nrows(s3_testing_bucket) == 1
 
             # Enqueue a second job and shutdown before backup runs
             with Session(db.engine) as session:
-                session.add(jobs[1])
+                session.add(job_defs[1])
                 session.commit()
 
         # On shutdown, final backup should run with both jobs