mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-24 03:16:12 -05:00
Code Issues Packages Projects Releases 157 Wiki Activity

unskip dolt pull --squash test

Browse Source
This commit is contained in:
Stephanie You
2023-10-09 10:29:29 -07:00
parent 5ca6a19962
commit aef2d199b4
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/bats/pull.bats
+11 -2
View File
@@ -196,14 +196,23 @@ SQL
}
@test "pull: pull squash" {
skip "todo: support dolt pull --squash"
cd repo2
dolt sql -q "create table t2 (i int primary key);"
dolt commit -Am "commit 1"
dolt pull --squash origin
run dolt sql -q "show tables" -r csv
[ "$status" -eq 0 ]
[ "${#lines[@]}" -eq 2 ]
[ "${#lines[@]}" -eq 3 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
[[ "$output" =~ "t2" ]] || false
run dolt log
[ "$status" -eq 0 ]
[[ "$output" =~ "Merge branch" ]] || false
[[ ! "$output" =~ "Second commit" ]] || false
[[ ! "$output" =~ "First commit" ]] || false
}
@test "pull: pull --noff flag" {
integration-tests/bats/sql-pull.bats
+11 -2
View File
@@ -204,14 +204,23 @@ SQL
}
@test "sql-pull: CALL dolt_pull squash" {
skip "todo: support dolt pull --squash (cli too)"
cd repo2
dolt sql -q "create table t2 (i int primary key);"
dolt commit -Am "commit 1"
dolt sql -q "CALL dolt_pull('--squash', 'origin')"
run dolt sql -q "show tables" -r csv
[ "$status" -eq 0 ]
[ "${#lines[@]}" -eq 2 ]
[ "${#lines[@]}" -eq 3 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
[[ "$output" =~ "t2" ]] || false
run dolt log
[ "$status" -eq 0 ]
[[ "$output" =~ "Merge branch" ]] || false
[[ ! "$output" =~ "Second commit" ]] || false
[[ ! "$output" =~ "First commit" ]] || false
}
@test "sql-pull: dolt_pull --noff flag" {