From 4949dc71b3ba7e774572aed56539f5d5f24d4d78 Mon Sep 17 00:00:00 2001 From: Nick Tobey Date: Wed, 24 May 2023 15:10:25 -0700 Subject: [PATCH] Remove tests on LD_1 format. --- integration-tests/bats/init.bats | 41 ----------------------------- integration-tests/bats/no-repo.bats | 7 ----- integration-tests/bats/stash.bats | 10 ------- 3 files changed, 58 deletions(-) diff --git a/integration-tests/bats/init.bats b/integration-tests/bats/init.bats index 0253da523b..9a2adb1cc9 100644 --- a/integration-tests/bats/init.bats +++ b/integration-tests/bats/init.bats @@ -191,47 +191,6 @@ teardown() { [[ $output =~ "NEW ( __DOLT__ )" ]] || false } -@test "init: initing an old database displays the correct version" { - set_dolt_user "baz", "bazbash.com" - - DOLT_DEFAULT_BIN_FORMAT="__LD_1__" dolt init - - run dolt version - [ "$status" -eq 0 ] - [[ $output =~ "database storage format: OLD ( __LD_1__ )" ]] || false - - run dolt sql -q "SELECT dolt_storage_format();" - [[ $output =~ "OLD ( __LD_1__ )" ]] || false -} - -@test "init: get format in multiple database mode" { - orig_bin_format=$DOLT_DEFAULT_BIN_FORMAT - - mkdir old_fmt - cd old_fmt - DOLT_DEFAULT_BIN_FORMAT="__LD_1__" dolt init - cd .. - - mkdir new_fmt - cd new_fmt - DOLT_DEFAULT_BIN_FORMAT="__DOLT__" dolt init - cd .. - - # New format db gets chosen automatically, as it is the only db loaded - export DOLT_DEFAULT_BIN_FORMAT="__DOLT__" - run dolt sql -q "SELECT dolt_storage_format()" - [ $status -eq 0 ] - [[ $output =~ "NEW ( __DOLT__ )" ]] || false - - # Old format db gets chosen automatically, as it is the only db loaded - export DOLT_DEFAULT_BIN_FORMAT="__LD_1__" - run dolt sql -q "SELECT dolt_storage_format()" - [ $status -eq 0 ] - [[ $output =~ "OLD ( __LD_1__ )" ]] || false - - export DOLT_DEFAULT_BIN_FORMAT=$orig_bin_format -} - @test "init: empty database folder displays no version" { set_dolt_user "baz", "bazbash.com" diff --git a/integration-tests/bats/no-repo.bats b/integration-tests/bats/no-repo.bats index 1ef7df05c1..40f7bc6250 100755 --- a/integration-tests/bats/no-repo.bats +++ b/integration-tests/bats/no-repo.bats @@ -346,13 +346,6 @@ NOT_VALID_REPO_ERROR="The current directory is not a valid dolt repository." [[ "$output" =~ "Failed to load the HOME directory" ]] } -@test "no-repo: init with new storage version" { - DOLT_DEFAULT_BIN_FORMAT="__DOLT__" dolt init - run cat .dolt/noms/manifest - [[ "$output" =~ "__DOLT__" ]] - [[ ! "$output" =~ "__LD_1__" ]] -} - @test "no-repo: dolt login exits when receiving SIGINT" { dolt login & # run this in the background PID=$! # capture background PID diff --git a/integration-tests/bats/stash.bats b/integration-tests/bats/stash.bats index 0a8f1e4503..99288e51dd 100644 --- a/integration-tests/bats/stash.bats +++ b/integration-tests/bats/stash.bats @@ -14,16 +14,6 @@ teardown() { teardown_common } -@test "stash: stash is not supported for old format" { - if [ "$DOLT_DEFAULT_BIN_FORMAT" = "__LD_1__" ]; then - dolt sql -q "INSERT INTO test VALUES (1, 'a')" - - run dolt stash - [ "$status" -eq 1 ] - [[ "$output" =~ "stash is not supported for old storage format" ]] || false - fi -} - @test "stash: stashing on clean working set" { run dolt stash [ "$status" -eq 0 ]