Fix two tests which depended on broken behavior

dolthub · Feb 1, 2024 · 9f85c88 · 9f85c88
1 parent 0b822a1
commit 9f85c88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/integration-tests/bats/remotes-push-pull.bats b/integration-tests/bats/remotes-push-pull.bats
@@ -326,7 +326,7 @@ SQL
 @test "remotes-push-pull: try to push a remote that is behind tip" {
     dolt remote add test-remote http://localhost:50051/test-org/test-repo
     dolt push test-remote main
-    cd "dolt-repo-clones"
+    cd dolt-repo-clones
     dolt clone http://localhost:50051/test-org/test-repo
     cd ..
     dolt sql <<SQL
@@ -343,11 +343,7 @@ SQL
     dolt add test
     dolt commit -m "test commit"
     dolt push test-remote main
-    cd "dolt-repo-clones/test-repo"
-    run dolt push origin main
-    [ "$status" -eq 0 ]
-    [[ "$output" =~ "Everything up-to-date" ]] || false
-    dolt fetch
+    cd dolt-repo-clones/test-repo
     run dolt push origin main
     [ "$status" -eq 1 ]
     [[ "$output" =~ " ! [rejected]            main -> main" ]] || false

diff --git a/integration-tests/bats/remotes.bats b/integration-tests/bats/remotes.bats
@@ -69,12 +69,12 @@ teardown() {
 
     cd repo2
     dolt remote add test-remote file://../remote
-    dolt push test-remote main
-    dolt checkout -b other
-    dolt push test-remote other
-    dolt branch -a
-    dolt checkout main
-    dolt branch -d other
+    dolt fetch test-remote
+
+    run dolt branch -a
+    [[ "$output" =~ "remotes/origin/other" ]] || false
+    [[ "$output" =~ "remotes/test-remote/other" ]] || false
+
     run dolt branch
     [[ ! "$output" =~ "other" ]] || false