Skip to content

Commit b93d3dc

Browse files
fix test cleanup
Created using spr 1.3.7
1 parent a54906c commit b93d3dc

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

premerge/advisor/advisor_lib.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ class TestExplanationRequest[TypedDict]:
2828
failures: list[TestFailure]
2929
platform: str
3030

31-
32-
_CREATE_TABLE_CMD = "CREATE TABLE failures(source_type, base_commit_sha, source_id, test_file, failure_message, platform)"
31+
_TABLE_SCHEMAS = {
32+
"failures": "CREATE TABLE failures(source_type, base_commit_sha, source_id, test_file, failure_message, platform)",
33+
"commits": "CREATE TABLE commits(commit_sha, commit_index)"
34+
}
3335

3436

3537
def _create_failures_table(connection: sqlite3.Connection):
3638
logging.info("Did not find failures table, creating.")
37-
connection.execute(_CREATE_TABLE_CMD)
39+
connection.execute(_CREATE_FAILURES_TABLE_CMD)
3840
connection.commit()
3941

4042

@@ -48,7 +50,7 @@ def setup_db(db_path: str) -> sqlite3.Connection:
4850
table_schema = connection.execute(
4951
"SELECT sql FROM sqlite_master WHERE name=?", ("failures",)
5052
).fetchone()
51-
if table_schema == (_CREATE_TABLE_CMD,):
53+
if table_schema == (_CREATE_FAILURES_TABLE_CMD,):
5254
return connection
5355

5456
# The schema of the table does not match what we were expecting. Keep the

premerge/advisor/git_utils_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ def setUp(self):
1212
self.db_file = tempfile.NamedTemporaryFile()
1313
self.db_connection = sqlite3.connect(self.db_file.name)
1414
self.db_connection.execute("CREATE TABLE commits(commit_sha, commit_index)")
15-
self.repository_path = tempfile.TemporaryDirectory(delete=False)
15+
self.repository_path = tempfile.TemporaryDirectory()
1616

1717
def tearDown(self):
1818
self.db_file.close()
19-
# self.repository_path.cleanup()
19+
self.repository_path.cleanup()
2020

2121
def setup_repository(self, commit_count: int) -> list[str]:
2222
subprocess.run(["git", "init"], cwd=self.repository_path.name, check=True)

0 commit comments

Comments
 (0)