From eccb060ca8383f1920e0fa6c069cbade88049fc0 Mon Sep 17 00:00:00 2001
From: Andy Arthur <andy@dolthub.com>
Date: Tue, 10 May 2022 14:34:05 -0700
Subject: [PATCH] unskipping more tests

---
 integration-tests/bats/column_tags.bats          | 1 +
 integration-tests/bats/dump.bats                 | 5 +----
 integration-tests/bats/import-create-tables.bats | 1 +
 integration-tests/bats/import-mysqldump.bats     | 1 +
 integration-tests/bats/no-repo.bats              | 2 +-
 integration-tests/bats/schema-import.bats        | 1 +
 integration-tests/bats/system-tables.bats        | 2 +-
 integration-tests/bats/verify-constraints.bats   | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/integration-tests/bats/column_tags.bats b/integration-tests/bats/column_tags.bats
index 997674c18a..1d72b3fa52 100644
--- a/integration-tests/bats/column_tags.bats
+++ b/integration-tests/bats/column_tags.bats
@@ -110,6 +110,7 @@ SQL
 }
 
 @test "column_tags: Merging branches that use the same tag referring to different column names fails" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE test (
   pk BIGINT NOT NULL COMMENT 'tag:1234',
diff --git a/integration-tests/bats/dump.bats b/integration-tests/bats/dump.bats
index e6509b12d4..b4e38c7083 100644
--- a/integration-tests/bats/dump.bats
+++ b/integration-tests/bats/dump.bats
@@ -232,10 +232,7 @@ teardown() {
 }
 
 @test "dump: SQL type - with keyless tables" {
-    if [ "$DOLT_FORMAT_FEATURE_FLAG" = true ]
-    then
-        skip "V1 storage format does not support keyless tables yet"
-    fi
+    skip_nbf_dolt_1
 
     dolt sql -q "CREATE TABLE new_table(pk int primary key);"
     dolt sql -q "INSERT INTO new_table VALUES (1);"
diff --git a/integration-tests/bats/import-create-tables.bats b/integration-tests/bats/import-create-tables.bats
index ca7cf006f7..5261b14900 100755
--- a/integration-tests/bats/import-create-tables.bats
+++ b/integration-tests/bats/import-create-tables.bats
@@ -144,6 +144,7 @@ DELIM
 }
 
 @test "import-create-tables: use -f to overwrite data in existing table with fk constraints" {
+    skip_nbf_dolt_1
     cat <<DELIM > other.csv
 pk,c1,c2,c3,c4,c5
 8,1,2,3,4,5
diff --git a/integration-tests/bats/import-mysqldump.bats b/integration-tests/bats/import-mysqldump.bats
index 74ef34ae85..f49d31ab02 100644
--- a/integration-tests/bats/import-mysqldump.bats
+++ b/integration-tests/bats/import-mysqldump.bats
@@ -1,4 +1,5 @@
 #!/usr/bin/env bats
+load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     REPO_NAME="dolt_repo_$$"
diff --git a/integration-tests/bats/no-repo.bats b/integration-tests/bats/no-repo.bats
index cd3c96151b..05abb3ef9c 100755
--- a/integration-tests/bats/no-repo.bats
+++ b/integration-tests/bats/no-repo.bats
@@ -313,7 +313,7 @@ NOT_VALID_REPO_ERROR="The current directory is not a valid dolt repository."
 }
 
 @test "no-repo: init with new storage version" {
-    DOLT_FORMAT_FEATURE_FLAG=true dolt init
+    DOLT_DEFAULT_BIN_FORMAT="__DOLT_1__" dolt init
     run cat .dolt/noms/manifest
     [[ "$output" =~ "__DOLT_1__" ]]
     [[ ! "$output" =~ "__LD_1__" ]]
diff --git a/integration-tests/bats/schema-import.bats b/integration-tests/bats/schema-import.bats
index 7a80fa58f5..2aa66a286e 100755
--- a/integration-tests/bats/schema-import.bats
+++ b/integration-tests/bats/schema-import.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     cat <<DELIM > 1pk5col-ints.csv
 pk,c1,c2,c3,c4,c5
diff --git a/integration-tests/bats/system-tables.bats b/integration-tests/bats/system-tables.bats
index 21cb668350..7b11ee9c3f 100644
--- a/integration-tests/bats/system-tables.bats
+++ b/integration-tests/bats/system-tables.bats
@@ -2,9 +2,9 @@
 load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
-    skip_nbf_dolt_1
     skiponwindows "tests are flaky on Windows"
     setup_common
+    skip_nbf_dolt_1
 
     # Needed for dolt_branches test
     cd $BATS_TMPDIR
diff --git a/integration-tests/bats/verify-constraints.bats b/integration-tests/bats/verify-constraints.bats
index 849f54014d..cb00efc46c 100644
--- a/integration-tests/bats/verify-constraints.bats
+++ b/integration-tests/bats/verify-constraints.bats
@@ -2,8 +2,8 @@
 load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
-    skip_nbf_dolt_1
     setup_common
+    skip_nbf_dolt_1
     dolt sql <<"SQL"
 CREATE TABLE parent3 (pk BIGINT PRIMARY KEY, v1 BIGINT, INDEX (v1));
 CREATE TABLE child3 (pk BIGINT PRIMARY KEY, v1 BIGINT, CONSTRAINT fk_name1 FOREIGN KEY (v1) REFERENCES parent3 (v1));