Merge pull request #6090 from dolthub/nicktobey/ci

Actually run bats tests in a configuration where all commands connect to a server process.

.github/workflows/ci-bats-unix.yaml

@@ -111,7 +111,7 @@ jobs:
         run: expect -v
       - name: Test all Unix
         env:
-          SQL_ENGINE: ${{ matrix.sql-engine }}
+          SQL_ENGINE: ${{ matrix.sql_engine }}
           PARQUET_RUNTIME_JAR: ${{ steps.parquet_cli.outputs.runtime_jar }}
           BATS_TEST_RETRIES: "3"
         run: |

integration-tests/bats/replication-multidb.bats

@@ -52,7 +52,7 @@ teardown() {
     cd $BATS_TMPDIR
 
     if ! [ "$DOLT_DEFAULT_BIN_FORMAT" = "__DOLT__" ]; then
-      dolt config --list | awk '{ print $1 }' | grep sqlserver.global | xargs dolt config --global --unset
+      dolt config --list | awk '{ print $1 }' | grep sqlserver.global | xargs -r dolt config --global --unset
     fi
 }
 

integration-tests/bats/sql-local-remote.bats

@@ -11,6 +11,9 @@ make_repo() {
 }
 
 setup() {
+    if [ "$SQL_ENGINE" = "remote-engine" ]; then
+      skip "This test tests remote connections directly, SQL_ENGINE is not needed."
+    fi
     setup_no_dolt_init
     make_repo defaultDB
     make_repo altDB
@@ -129,4 +132,3 @@ teardown() {
     [ "$status" -eq 0 ]
     [[ "$output" =  $out ]] || false
 }
-