From 649620020ccdbbc42ca6b13e9ef2b534fcd01a8f Mon Sep 17 00:00:00 2001
From: Nick Tobey <nick@dolthub.com>
Date: Wed, 24 May 2023 13:37:36 -0700
Subject: [PATCH] Remove uses of skip_nbf_ld_1, since all tests now use
 __DOLT__

---
 integration-tests/bats/ignore.bats | 18 ------------------
 integration-tests/bats/show.bats   |  6 ------
 integration-tests/bats/stash.bats  | 25 -------------------------
 3 files changed, 49 deletions(-)

diff --git a/integration-tests/bats/ignore.bats b/integration-tests/bats/ignore.bats
index f5a8396d4a..ca68840580 100644
--- a/integration-tests/bats/ignore.bats
+++ b/integration-tests/bats/ignore.bats
@@ -64,7 +64,6 @@ get_conflict_tables() {
 }
 
 @test "ignore: simple matches" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -83,7 +82,6 @@ SQL
 }
 
 @test "ignore: specific overrides" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE please_ignore (pk int);
@@ -106,7 +104,6 @@ SQL
 }
 
 @test "ignore: conflict" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE commit_ignore (pk int);
@@ -122,7 +119,6 @@ SQL
 }
 
 @test "ignore: question mark" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE test (pk int);
@@ -141,7 +137,6 @@ SQL
 }
 
 @test "ignore: don't stash ignored tables" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -154,7 +149,6 @@ SQL
 }
 
 @test "ignore: error when trying to stash table with dolt_ignore conflict" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE commit_ignore (pk int);
@@ -169,7 +163,6 @@ SQL
 }
 
 @test "ignore: stash ignored and untracked tables when --all is passed" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -194,7 +187,6 @@ SQL
 }
 
 @test "ignore: stash table with dolt_ignore conflict when --all is passed" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE commit_ignore (pk int);
@@ -215,7 +207,6 @@ SQL
 }
 
 @test "ignore: allow staging ignored tables if 'add --force' is supplied" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -229,7 +220,6 @@ SQL
 }
 
 @test "ignore: don't auto-stage ignored tables" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -247,7 +237,6 @@ SQL
 }
 
 @test "ignore: dolt status doesn't show ignored tables when --ignored is not supplied" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -265,7 +254,6 @@ SQL
 }
 
 @test "ignore: dolt status shows ignored tables when --ignored is not supplied" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -283,7 +271,6 @@ SQL
 }
 
 @test "ignore: don't display new but ignored tables in dolt diff" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -299,7 +286,6 @@ SQL
 }
 
 @test "ignore: don't display new but ignored tables in reverse diff" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -315,7 +301,6 @@ SQL
 }
 
 @test "ignore: DO display modified ignored tables in dolt diff after staging" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -337,7 +322,6 @@ SQL
 }
 
 @test "ignore: DO display modified ignored tables in reverse diff after staging" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -359,7 +343,6 @@ SQL
 }
 
 @test "ignore: DO display modified ignored tables in dolt diff after committing" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 CREATE TABLE ignoreme (pk int);
@@ -382,7 +365,6 @@ SQL
 }
 
 @test "ignore: detect when equivalent patterns have different values" {
-    skip_nbf_ld_1
 
     dolt sql <<SQL
 INSERT INTO dolt_ignore VALUES
diff --git a/integration-tests/bats/show.bats b/integration-tests/bats/show.bats
index 6ea337b90d..b36979afa6 100644
--- a/integration-tests/bats/show.bats
+++ b/integration-tests/bats/show.bats
@@ -123,7 +123,6 @@ assert_has_key_value() {
 }
 
 @test "show: --no-pretty" {
-    skip_nbf_ld_1
     dolt commit --allow-empty -m "commit: initialize table1"
     run dolt show --no-pretty
     [ $status -eq 0 ]
@@ -141,7 +140,6 @@ assert_has_key_value() {
 }
 
 @test "show: HEAD root" {
-    skip_nbf_ld_1
     dolt sql -q "create table table1 (pk int PRIMARY KEY)"
     dolt sql -q "insert into table1 values (1), (2), (3)"
     dolt add .
@@ -164,7 +162,6 @@ assert_has_key_value() {
 }
 
 @test "show: WORKING" {
-    skip_nbf_ld_1
     dolt sql -q "create table table1 (pk int PRIMARY KEY)"
     dolt sql -q "insert into table1 values (1), (2), (3)"
     dolt add .
@@ -182,7 +179,6 @@ assert_has_key_value() {
 }
 
 @test "show: STAGED" {
-    skip_nbf_ld_1
     dolt sql -q "create table table1 (pk int PRIMARY KEY)"
     dolt sql -q "insert into table1 values (1), (2), (3)"
     dolt add .
@@ -200,7 +196,6 @@ assert_has_key_value() {
 }
 
 @test "show: table" {
-    skip_nbf_ld_1
     dolt sql -q "create table table1 (pk int PRIMARY KEY)"
     dolt sql -q "insert into table1 values (1), (2), (3)"
     dolt add .
@@ -223,7 +218,6 @@ assert_has_key_value() {
 }
 
 @test "show: pretty commit from hash" {
-    skip_nbf_ld_1
     dolt tag v0
     dolt commit --allow-empty -m "commit1"
 
diff --git a/integration-tests/bats/stash.bats b/integration-tests/bats/stash.bats
index 51a6694845..0a8f1e4503 100644
--- a/integration-tests/bats/stash.bats
+++ b/integration-tests/bats/stash.bats
@@ -25,14 +25,12 @@ teardown() {
 }
 
 @test "stash: stashing on clean working set" {
-    skip_nbf_ld_1
     run dolt stash
     [ "$status" -eq 0 ]
     [[ "$output" =~ "No local changes to save" ]] || false
 }
 
 @test "stash: simple stashing and popping stash" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt sql -q "SELECT * FROM test"
     [ "$status" -eq 0 ]
@@ -61,7 +59,6 @@ teardown() {
 }
 
 @test "stash: clearing stash when stash list is empty" {
-    skip_nbf_ld_1
     run dolt stash list
     [ "$status" -eq 0 ]
     [ "${#lines[@]}" -eq 0 ]
@@ -72,7 +69,6 @@ teardown() {
 }
 
 @test "stash: clearing stash removes all entries in stash list" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     dolt stash
 
@@ -95,7 +91,6 @@ teardown() {
 }
 
 @test "stash: clearing stash and stashing again" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     dolt stash
 
@@ -114,7 +109,6 @@ teardown() {
 }
 
 @test "stash: clearing stash and popping returns error of no entries found" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     dolt stash
     dolt sql -q "INSERT INTO test VALUES (2, 'b')"
@@ -143,7 +137,6 @@ teardown() {
 }
 
 @test "stash: popping oldest stash" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt stash
     [ "$status" -eq 0 ]
@@ -176,7 +169,6 @@ teardown() {
 }
 
 @test "stash: popping neither latest nor oldest stash" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt stash
     [ "$status" -eq 0 ]
@@ -229,7 +221,6 @@ teardown() {
 }
 
 @test "stash: stashing multiple entries on different branches" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt stash
     [ "$status" -eq 0 ]
@@ -246,7 +237,6 @@ teardown() {
 }
 
 @test "stash: popping stash on different branch" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt stash
     [ "$status" -eq 0 ]
@@ -264,7 +254,6 @@ teardown() {
 }
 
 @test "stash: dropping stash removes an entry at given index in stash list" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt stash
     [ "$status" -eq 0 ]
@@ -309,7 +298,6 @@ teardown() {
 }
 
 @test "stash: popping stash on dirty working set with no conflict" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt stash
     [ "$status" -eq 0 ]
@@ -330,7 +318,6 @@ teardown() {
 }
 
 @test "stash: popping stash on dirty working set with conflict" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt stash
     [ "$status" -eq 0 ]
@@ -351,7 +338,6 @@ teardown() {
 }
 
 @test "stash: stashing both modified staged and working set of changes and popping the stash" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     dolt add .
     dolt sql -q "INSERT INTO test VALUES (2, 'b')"
@@ -385,7 +371,6 @@ teardown() {
 }
 
 @test "stash: stashing on working set with untracked tables only should be nothing to stash" {
-    skip_nbf_ld_1
     dolt sql -q "CREATE TABLE new_table (id INT PRIMARY KEY);"
 
     run dolt status
@@ -403,7 +388,6 @@ teardown() {
 }
 
 @test "stash: stashing untracked tables with --include-untracked flag and popping the table should not be staged" {
-    skip_nbf_ld_1
     dolt sql -q "CREATE TABLE new_table (id INT PRIMARY KEY);"
     dolt add .
     dolt sql -q "CREATE TABLE test_table (id INT);"
@@ -429,7 +413,6 @@ teardown() {
 }
 
 @test "stash: stashing staged new table changes and popping the stash, the added table should be staged" {
-    skip_nbf_ld_1
     dolt sql -q "CREATE TABLE new_table (id INT PRIMARY KEY);"
     dolt add .
 
@@ -463,7 +446,6 @@ teardown() {
 }
 
 @test "stash: stashing with staged, working set changes with untracked tables should only stash modified working set and staged changes" {
-    skip_nbf_ld_1
     dolt sql -q "CREATE TABLE new_table (id INT PRIMARY KEY);"
     dolt add .
     dolt sql -q "INSERT INTO new_table VALUES (1),(2);"
@@ -500,7 +482,6 @@ teardown() {
 }
 
 @test "stash: stashing working set with deleted table and popping it" {
-    skip_nbf_ld_1
     dolt sql -q "CREATE TABLE new_table (id INT PRIMARY KEY);"
     dolt commit -Am "create new table"
 
@@ -533,7 +514,6 @@ teardown() {
 }
 
 @test "stash: simple stashing and popping stash after running GC" {
-    skip_nbf_ld_1
     dolt sql -q "INSERT INTO test VALUES (1, 'a')"
     run dolt sql -q "SELECT * FROM test"
     [ "$status" -eq 0 ]
@@ -568,7 +548,6 @@ teardown() {
 }
 
 @test "stash: popping stash with deleted table that is deleted already on current head" {
-    skip_nbf_ld_1
     dolt branch branch1
     dolt checkout -b branch2
     dolt sql -q "DROP TABLE test;"
@@ -597,7 +576,6 @@ teardown() {
 }
 
 @test "stash: popping stash with deleted table that the same table exists on current head" {
-    skip_nbf_ld_1
     dolt branch branch1
     dolt branch branch2
 
@@ -630,7 +608,6 @@ teardown() {
 }
 
 @test "stash: popping stash with deleted table that different table with same name on current head gives conflict" {
-    skip_nbf_ld_1
     dolt branch branch1
     dolt branch branch2
 
@@ -661,7 +638,6 @@ teardown() {
 }
 
 @test "stash: popping stash with added table with PK on current head with the exact same table is added already" {
-    skip_nbf_ld_1
     dolt branch branch1
     dolt checkout -b branch2
     dolt sql -q "CREATE TABLE new_test(id INT PRIMARY KEY); INSERT INTO new_test VALUES (1);"
@@ -691,7 +667,6 @@ teardown() {
 }
 
 @test "stash: popping stash with added keyless table on current head with the exact same table is added already" {
-    skip_nbf_ld_1
     dolt branch branch1
     dolt checkout -b branch2
     dolt sql -q "CREATE TABLE new_test(id INT); INSERT INTO new_test VALUES (1);"