From 389f4a95c32d0d5f614fe7b233c04d3f332a95bb Mon Sep 17 00:00:00 2001 From: Neil Macneale IV Date: Thu, 20 Feb 2025 10:02:19 -0800 Subject: [PATCH] Make tests resilient to windows file paths --- .../enginetest/dolt_system_table_queries.go | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_system_table_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_system_table_queries.go index fa83629048..fcfddfb4db 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_system_table_queries.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_system_table_queries.go @@ -58,22 +58,21 @@ var BackupsSystemTableQueries = queries.ScriptTest{ SetUpScript: []string{ `call dolt_backup("add", "backup3", "file:///tmp/backup3");`, `call dolt_backup("add", "backup1", "file:///tmp/backup1");`, - `call dolt_backup("add", "backup2", "file:///tmp/backup2");`, + `call dolt_backup("add", "backup2", "aws://[ddb_table:ddb_s3_bucket]/db1");`, }, Assertions: []queries.ScriptTestAssertion{ { - Query: "select * from dolt_backups;", + // Query for just the names because on Windows the Drive letter is inserted into the file path + Query: "select name from dolt_backups;", Expected: []sql.Row{ - {"backup1", "file:///tmp/backup1"}, - {"backup2", "file:///tmp/backup2"}, - {"backup3", "file:///tmp/backup3"}, + {"backup1"}, + {"backup2"}, + {"backup3"}, }, }, { - Query: "select url from dolt_backups where name = 'backup1';", - Expected: []sql.Row{ - {"file:///tmp/backup1"}, - }, + Query: "select url from dolt_backups where name = 'backup2';", + Expected: []sql.Row{{"aws://[ddb_table:ddb_s3_bucket]/db1"}}, }, { Query: "delete from dolt_backups where name = 'backup1';", @@ -84,11 +83,11 @@ var BackupsSystemTableQueries = queries.ScriptTest{ ExpectedErrStr: "table doesn't support UPDATE", }, { - Query: "insert into dolt_backups values ('backup4', 'file:///tmp/backup4');", + Query: "insert into dolt_backups values ('backup4', 'file:///tmp/broken');", // nolint: gas ExpectedErrStr: "table doesn't support INSERT INTO", }, { - Query: "call dolt_backup('add', 'backup4', 'file:///tmp/backup4');", + Query: "call dolt_backup('add', 'backup4', 'aws://[ddb_table_4:ddb_s3_bucket_4]/db1');", Expected: []sql.Row{{0}}, }, { @@ -96,11 +95,10 @@ var BackupsSystemTableQueries = queries.ScriptTest{ Expected: []sql.Row{{0}}, }, { - Query: "select * from dolt_backups;", + Query: "select * from dolt_backups where url like 'aws://%'", Expected: []sql.Row{ - {"backup2", "file:///tmp/backup2"}, - {"backup3", "file:///tmp/backup3"}, - {"backup4", "file:///tmp/backup4"}, + {"backup2", "aws://[ddb_table:ddb_s3_bucket]/db1"}, + {"backup4", "aws://[ddb_table_4:ddb_s3_bucket_4]/db1"}, }, }, },