From e0405cd347b027919b4c6a5c230690a0cf38d815 Mon Sep 17 00:00:00 2001 From: Vinai Rachakonda Date: Tue, 3 Aug 2021 18:14:52 -0700 Subject: [PATCH 1/2] updt tests --- integration-tests/bats/sql-merge.bats | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/integration-tests/bats/sql-merge.bats b/integration-tests/bats/sql-merge.bats index 2a0dfe6b52..f74456d55a 100644 --- a/integration-tests/bats/sql-merge.bats +++ b/integration-tests/bats/sql-merge.bats @@ -36,6 +36,8 @@ SELECT DOLT_CHECKOUT('master'); SQL run dolt sql -q "SELECT DOLT_MERGE('feature-branch');" [ $status -eq 0 ] + [[ "$output" =~ "| 1" ]] || false # validate that merge returns 1 not "Updating..." + ! [[ "$output" =~ "Updating" ]] || false run dolt log -n 1 [ $status -eq 0 ] @@ -283,10 +285,11 @@ SELECT DOLT_MERGE('feature-branch'); SELECT * FROM dolt_conflicts; SELECT DOLT_MERGE('--abort'); SQL - [ $status -eq 0 ] - [[ "$output" =~ "table,num_conflicts" ]] || false - [[ "$output" =~ "one_pk,1" ]] || false + [[ "${lines[2]}" =~ "table,num_conflicts" ]] || false + [[ "${lines[3]}" =~ "one_pk,1" ]] || false + [[ "${lines[4]}" =~ "DOLT_MERGE('--abort')" ]] || false + [[ "${lines[5]}" =~ "1" ]] || false # now resolve commits run dolt sql --disable-batch << SQL From 6a1c5ded216223ebac1e680281422c4b698e810f Mon Sep 17 00:00:00 2001 From: Vinai Rachakonda Date: Tue, 3 Aug 2021 18:19:26 -0700 Subject: [PATCH 2/2] nits --- integration-tests/bats/sql-merge.bats | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/integration-tests/bats/sql-merge.bats b/integration-tests/bats/sql-merge.bats index f74456d55a..a0352a336b 100644 --- a/integration-tests/bats/sql-merge.bats +++ b/integration-tests/bats/sql-merge.bats @@ -36,8 +36,6 @@ SELECT DOLT_CHECKOUT('master'); SQL run dolt sql -q "SELECT DOLT_MERGE('feature-branch');" [ $status -eq 0 ] - [[ "$output" =~ "| 1" ]] || false # validate that merge returns 1 not "Updating..." - ! [[ "$output" =~ "Updating" ]] || false run dolt log -n 1 [ $status -eq 0 ] @@ -120,6 +118,10 @@ SQL [ $status -eq 0 ] [[ "$output" =~ "true" ]] || false + [[ "$output" =~ "true" ]] || false + [[ "${lines[26]}" =~ "DOLT_MERGE('feature-branch')" ]] || false # validate that merge returns 1 not "Updating..." + [[ "${lines[28]}" =~ "1" ]] || false + ! [[ "$output" =~ "Updating" ]] || false run dolt sql -q "SELECT * FROM test" -r csv [ $status -eq 0 ]