mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-24 03:09:22 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

better fetch bats tests

Browse Source
This commit is contained in:
Stephanie You
2023-09-15 16:34:40 -07:00
parent ad4a66ad1a
commit be569fc920
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/cmd/dolt/commands/fetch.go
View File

@@ -106,7 +106,7 @@ func (cmd FetchCmd) Exec(ctx context.Context, commandStr string, args []string,
spinner := TextSpinner{}
cli.Print(spinner.next() + " Fetching...")
defer func() {
cli.DeleteAndPrint(13, "")
cli.DeleteAndPrint(len(" Fetching...")+1, "")
}()
for {
@@ -116,7 +116,7 @@ func (cmd FetchCmd) Exec(ctx context.Context, commandStr string, args []string,
case <-ctx.Done():
return HandleVErrAndExitCode(nil, usage)
case <-time.After(time.Millisecond * 50):
cli.DeleteAndPrint(13, spinner.next()+" Fetching...")
cli.DeleteAndPrint(len(" Fetching...")+1, spinner.next()+" Fetching...")
}
}
}

43
integration-tests/bats/fetch.bats
View File

@@ -59,7 +59,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "show tables as of hashof('origin/main')" -r csv
run dolt sql -q "show tables as of 'origin/main'" -r csv
[ "${#lines[@]}" -eq 2 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
@@ -81,10 +81,11 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "show tables as of hashof('origin/main')" -r csv
run dolt sql -q "show tables as of 'origin/main'" -r csv
[ "${#lines[@]}" -eq 2 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
[[ ! "$output" =~ "t2" ]] || false
run dolt branch -r
[ "$status" -eq 0 ]
@@ -92,31 +93,45 @@ teardown() {
}
@test "fetch: fetch custom remote" {
cd repo2
cd repo1
dolt sql -q "create table t2 (a int primary key, b int)"
dolt add .
dolt commit -am "Third commit"
dolt push test-remote main
cd ../repo2
dolt fetch test-remote
run dolt diff main test-remote/main
[ "$status" -eq 0 ]
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "show tables as of hashof('test-remote/main')" -r csv
[ "${#lines[@]}" -eq 2 ]
run dolt sql -q "show tables as of 'test-remote/main'" -r csv
[ "${#lines[@]}" -eq 3 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
[[ "$output" =~ "t2" ]] || false
}
@test "fetch: fetch specific ref" {
cd repo2
cd repo1
dolt sql -q "create table t2 (a int primary key, b int)"
dolt add .
dolt commit -am "Third commit"
dolt push test-remote main
cd ../repo2
dolt fetch test-remote refs/heads/main:refs/remotes/test-remote/main
run dolt diff main test-remote/main
[ "$status" -eq 0 ]
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "show tables as of hashof('test-remote/main')" -r csv
[ "${#lines[@]}" -eq 2 ]
run dolt sql -q "show tables as of 'test-remote/main'" -r csv
[ "${#lines[@]}" -eq 3 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
[[ "$output" =~ "t2" ]] || false
}
@test "fetch: fetch feature branch" {
@@ -130,7 +145,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "show tables as of hashof('origin/feature')" -r csv
run dolt sql -q "show tables as of 'origin/feature'" -r csv
[ "${#lines[@]}" -eq 2 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
@@ -148,7 +163,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "show tables as of hashof('v1')" -r csv
run dolt sql -q "show tables as of 'v1'" -r csv
[ "${#lines[@]}" -eq 2 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
@@ -167,7 +182,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "show tables as of hashof('v1')" -r csv
run dolt sql -q "show tables as of 'v1'" -r csv
[ "${#lines[@]}" -eq 2 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
@@ -181,7 +196,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "show tables as of hashof('test-remote/other')" -r csv
run dolt sql -q "show tables as of 'test-remote/other'" -r csv
[ "${#lines[@]}" -eq 2 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
@@ -196,7 +211,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ ! "$output" =~ "removed table" ]] || false
run dolt sql -q "show tables as of hashof('main')" -r csv
run dolt sql -q "show tables as of 'main'" -r csv
[ "${#lines[@]}" -eq 2 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t1" ]] || false
@@ -218,7 +233,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "deleted table" ]] || false
run dolt sql -q "show tables as of hashof('origin/main')" -r csv
run dolt sql -q "show tables as of 'origin/main'" -r csv
[ "${#lines[@]}" -eq 2 ]
[[ "$output" =~ "Table" ]] || false
[[ "$output" =~ "t2" ]] || false