mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-21 11:29:51 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

Update engine tests: cherry-pick verification failure now returns error not row

Browse Source 
The three test assertions that expected sql.Row{{"",0,0,0,1}} now use
ExpectedErrStr with the specific "commit verification failed: ..." message.
The dolt_status check between the initial failure and --continue remains,
confirming dirty state is preserved via the explicit CommitTransaction.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Neil Macneale IV
2026-02-27 00:18:21 +00:00
parent 447631cd5f
commit e1a1c569b2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/sqle/enginetest/dolt_queries_commit_verification.go
+9 -9
View File
@@ -246,9 +246,9 @@ var DoltCommitVerificationScripts = []queries.ScriptTest{
},
Assertions: []queries.ScriptTestAssertion{
{
// Verification fails; returns verification_failures=1 with no SQL error so dirty state is preserved
Query: "CALL dolt_cherry_pick(@commit_hash)",
Expected: []sql.Row{{"", int64(0), int64(0), int64(0), int64(1)}},
// Verification fails; returns specific error, dirty state preserved via explicit CommitTransaction
Query: "CALL dolt_cherry_pick(@commit_hash)",
ExpectedErrStr: "commit verification failed: test_users_count (Assertion failed: expected_single_value equal to 1, got 2)",
},
{
// users table should be staged (cherry-pick changes are preserved by the committed transaction)
@@ -256,9 +256,9 @@ var DoltCommitVerificationScripts = []queries.ScriptTest{
Expected: []sql.Row{{uint64(1)}},
},
{
// --continue without fixing still returns verification_failures=1, dirty state preserved
Query: "CALL dolt_cherry_pick('--continue')",
Expected: []sql.Row{{"", int64(0), int64(0), int64(0), int64(1)}},
// --continue without fixing still fails with specific error, dirty state preserved
Query: "CALL dolt_cherry_pick('--continue')",
ExpectedErrStr: "commit verification failed: test_users_count (Assertion failed: expected_single_value equal to 1, got 2)",
},
{
// Abort restores clean state
@@ -299,9 +299,9 @@ var DoltCommitVerificationScripts = []queries.ScriptTest{
},
Assertions: []queries.ScriptTestAssertion{
{
// Verification fails; workspace is left dirty with verification_failures=1
Query: "CALL dolt_cherry_pick(@commit_hash)",
Expected: []sql.Row{{"", int64(0), int64(0), int64(0), int64(1)}},
// Verification fails; returns specific error, dirty state preserved via explicit CommitTransaction
Query: "CALL dolt_cherry_pick(@commit_hash)",
ExpectedErrStr: "commit verification failed: test_users_count (Assertion failed: expected_single_value equal to 1, got 2)",
},
{
// Fix the test to match the new row count and stage