From d477aa6592bd9bafff99bdaf0e97f5befd790a14 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 11 Feb 2022 10:33:09 -0500 Subject: [PATCH] fix connection handling in consumption test these tests were leaving connections opened. This rev is necessary for tests to pass assuming QueuePool for SQLite file connections, in I5f6c259def0ef43d401c6163dc99f651e519148d Change-Id: I5f6c259def0ef43d401c6163dc99f651e519148d --- tests/test_script_consumption.py | 43 +++++++++++++++++++------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/tests/test_script_consumption.py b/tests/test_script_consumption.py index 96161f6d..2f9f7481 100644 --- a/tests/test_script_consumption.py +++ b/tests/test_script_consumption.py @@ -242,44 +242,51 @@ class ApplyVersionsFunctionalTest(PatchEnvironment, TestBase): def _test_002_upgrade(self): command.upgrade(self.cfg, self.c) db = self.bind - assert db.dialect.has_table(db.connect(), "foo") - assert db.dialect.has_table(db.connect(), "bar") - assert db.dialect.has_table(db.connect(), "bat") + + with db.connect() as conn: + assert db.dialect.has_table(conn, "foo") + assert db.dialect.has_table(conn, "bar") + assert db.dialect.has_table(conn, "bat") def _test_003_downgrade(self): command.downgrade(self.cfg, self.a) db = self.bind - assert db.dialect.has_table(db.connect(), "foo") - assert not db.dialect.has_table(db.connect(), "bar") - assert not db.dialect.has_table(db.connect(), "bat") + with db.connect() as conn: + assert db.dialect.has_table(conn, "foo") + assert not db.dialect.has_table(conn, "bar") + assert not db.dialect.has_table(conn, "bat") def _test_004_downgrade(self): command.downgrade(self.cfg, "base") db = self.bind - assert not db.dialect.has_table(db.connect(), "foo") - assert not db.dialect.has_table(db.connect(), "bar") - assert not db.dialect.has_table(db.connect(), "bat") + with db.connect() as conn: + assert not db.dialect.has_table(conn, "foo") + assert not db.dialect.has_table(conn, "bar") + assert not db.dialect.has_table(conn, "bat") def _test_005_upgrade(self): command.upgrade(self.cfg, self.b) db = self.bind - assert db.dialect.has_table(db.connect(), "foo") - assert db.dialect.has_table(db.connect(), "bar") - assert not db.dialect.has_table(db.connect(), "bat") + with db.connect() as conn: + assert db.dialect.has_table(conn, "foo") + assert db.dialect.has_table(conn, "bar") + assert not db.dialect.has_table(conn, "bat") def _test_006_upgrade_again(self): command.upgrade(self.cfg, self.b) db = self.bind - assert db.dialect.has_table(db.connect(), "foo") - assert db.dialect.has_table(db.connect(), "bar") - assert not db.dialect.has_table(db.connect(), "bat") + with db.connect() as conn: + assert db.dialect.has_table(conn, "foo") + assert db.dialect.has_table(conn, "bar") + assert not db.dialect.has_table(conn, "bat") def _test_007_stamp_upgrade(self): command.stamp(self.cfg, self.c) db = self.bind - assert db.dialect.has_table(db.connect(), "foo") - assert db.dialect.has_table(db.connect(), "bar") - assert not db.dialect.has_table(db.connect(), "bat") + with db.connect() as conn: + assert db.dialect.has_table(conn, "foo") + assert db.dialect.has_table(conn, "bar") + assert not db.dialect.has_table(conn, "bat") class LegacyApplyVersionsFunctionalTest(ApplyVersionsFunctionalTest): -- 2.47.2