diff --git a/.dockerignore b/.dockerignore index d57b0ddfb9..06c5778caf 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,5 @@ Jenkinsfile -bats/ +integration-tests/bats/ proto/ samples/ benchmark/ diff --git a/.github/workflows/ci-bats-tests.yaml b/.github/workflows/ci-bats-tests.yaml index 620f4d7f6a..93ca9cfdd3 100644 --- a/.github/workflows/ci-bats-tests.yaml +++ b/.github/workflows/ci-bats-tests.yaml @@ -98,7 +98,7 @@ jobs: if: matrix.os == 'windows-2019' run: | bats --tap . - working-directory: ./bats + working-directory: ./integration-tests/bats env: IS_WINDOWS: true WINDOWS_BASE_DIR: "/d/a" @@ -106,4 +106,4 @@ jobs: if: matrix.os != 'windows-2019' run: | bats --tap . - working-directory: ./bats + working-directory: ./integration-tests/bats diff --git a/.gitmodules b/.gitmodules index 412eb09c78..9548657731 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,6 @@ [submodule "proto/third_party/grpc-go"] path = proto/third_party/grpc-go url = https://github.com/grpc/grpc-go.git -[submodule "mysql-client-tests/cpp/third_party/mysql-connector-cpp"] - path = mysql-client-tests/cpp/third_party/mysql-connector-cpp - url = https://github.com/mysql/mysql-connector-cpp.git +[submodule "integration-tests/mysql-client-tests/cpp/third_party/mysql-connector-cpp"] + path = integration-tests/mysql-client-tests/cpp/third_party/mysql-connector-cpp + url = https://github.com/mysql/mysql-connector-cpp diff --git a/MySQLDockerfile b/MySQLDockerfile index 9ffa64ebd3..b068fcef24 100644 --- a/MySQLDockerfile +++ b/MySQLDockerfile @@ -71,8 +71,8 @@ RUN curl -L -o /mysql-client-tests/java/mysql-connector-java-8.0.21.jar \ https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar # install node deps -COPY ./mysql-client-tests/node/package.json /mysql-client-tests/node/ -COPY ./mysql-client-tests/node/package-lock.json /mysql-client-tests/node/ +COPY ./integration-tests/mysql-client-tests/node/package.json /mysql-client-tests/node/ +COPY ./integration-tests/mysql-client-tests/node/package-lock.json /mysql-client-tests/node/ WORKDIR /mysql-client-tests/node RUN npm install @@ -80,8 +80,8 @@ RUN npm install RUN cpanm DBD::mysql # install ruby dependencies -COPY ./mysql-client-tests/ruby/Gemfile /mysql-client-tests/ruby/ -COPY ./mysql-client-tests/ruby/Gemfile.lock /mysql-client-tests/ruby/ +COPY ./integration-tests/mysql-client-tests/ruby/Gemfile /mysql-client-tests/ruby/ +COPY ./integration-tests/mysql-client-tests/ruby/Gemfile.lock /mysql-client-tests/ruby/ WORKDIR /mysql-client-tests/ruby RUN gem install bundler -v 2.1.4 RUN bundle install @@ -92,8 +92,8 @@ COPY ./go/ . ENV GOFLAGS="-mod=readonly" RUN go build -o /usr/local/bin/dolt ./cmd/dolt -COPY ./mysql-client-tests /mysql-client-tests -COPY ./mysql-client-tests-entrypoint.sh /mysql-client-tests/entrypoint.sh +COPY ./integration-tests/mysql-client-tests /mysql-client-tests +COPY ./integration-tests/mysql-client-tests/mysql-client-tests-entrypoint.sh /mysql-client-tests/entrypoint.sh WORKDIR /mysql-client-tests ENTRYPOINT ["/mysql-client-tests/entrypoint.sh"] diff --git a/MySQLDockerfile.dockerignore b/MySQLDockerfile.dockerignore index a10bfd560b..a9e0d4de5a 100644 --- a/MySQLDockerfile.dockerignore +++ b/MySQLDockerfile.dockerignore @@ -1,4 +1,4 @@ -mysql-client-tests/c/mysql-client-tests -mysql-client-tests/java/MySQLConnectorTest.class -mysql-client-tests/cpp/_build/**/* -mysql-client-tests/cpp/_build +integration-tests/mysql-client-tests/c/mysql-client-tests +integration-tests/mysql-client-tests/java/MySQLConnectorTest.class +integration-tests/mysql-client-tests/cpp/_build/**/* +integration-tests/mysql-client-tests/cpp/_build diff --git a/bats/.gitignore b/integration-tests/bats/.gitignore similarity index 100% rename from bats/.gitignore rename to integration-tests/bats/.gitignore diff --git a/bats/1pk5col-ints.bats b/integration-tests/bats/1pk5col-ints.bats similarity index 100% rename from bats/1pk5col-ints.bats rename to integration-tests/bats/1pk5col-ints.bats diff --git a/bats/1pk5col-strings.bats b/integration-tests/bats/1pk5col-strings.bats similarity index 100% rename from bats/1pk5col-strings.bats rename to integration-tests/bats/1pk5col-strings.bats diff --git a/bats/1pksupportedtypes.bats b/integration-tests/bats/1pksupportedtypes.bats similarity index 100% rename from bats/1pksupportedtypes.bats rename to integration-tests/bats/1pksupportedtypes.bats diff --git a/bats/2pk5cols-ints.bats b/integration-tests/bats/2pk5cols-ints.bats similarity index 100% rename from bats/2pk5cols-ints.bats rename to integration-tests/bats/2pk5cols-ints.bats diff --git a/bats/README.md b/integration-tests/bats/README.md similarity index 100% rename from bats/README.md rename to integration-tests/bats/README.md diff --git a/bats/arg-parsing.bats b/integration-tests/bats/arg-parsing.bats similarity index 100% rename from bats/arg-parsing.bats rename to integration-tests/bats/arg-parsing.bats diff --git a/bats/auto_increment.bats b/integration-tests/bats/auto_increment.bats similarity index 100% rename from bats/auto_increment.bats rename to integration-tests/bats/auto_increment.bats diff --git a/bats/aws-remotes.bats b/integration-tests/bats/aws-remotes.bats similarity index 100% rename from bats/aws-remotes.bats rename to integration-tests/bats/aws-remotes.bats diff --git a/bats/back-compat.bats b/integration-tests/bats/back-compat.bats similarity index 100% rename from bats/back-compat.bats rename to integration-tests/bats/back-compat.bats diff --git a/bats/blame.bats b/integration-tests/bats/blame.bats similarity index 100% rename from bats/blame.bats rename to integration-tests/bats/blame.bats diff --git a/bats/case-sensitivity.bats b/integration-tests/bats/case-sensitivity.bats similarity index 100% rename from bats/case-sensitivity.bats rename to integration-tests/bats/case-sensitivity.bats diff --git a/bats/column_tags.bats b/integration-tests/bats/column_tags.bats similarity index 100% rename from bats/column_tags.bats rename to integration-tests/bats/column_tags.bats diff --git a/bats/commit_tags.bats b/integration-tests/bats/commit_tags.bats similarity index 100% rename from bats/commit_tags.bats rename to integration-tests/bats/commit_tags.bats diff --git a/bats/common.bash.bats b/integration-tests/bats/common.bash.bats similarity index 100% rename from bats/common.bash.bats rename to integration-tests/bats/common.bash.bats diff --git a/bats/compatibility/README.md b/integration-tests/bats/compatibility/README.md similarity index 100% rename from bats/compatibility/README.md rename to integration-tests/bats/compatibility/README.md diff --git a/bats/compatibility/corona-virus-test.sh b/integration-tests/bats/compatibility/corona-virus-test.sh similarity index 100% rename from bats/compatibility/corona-virus-test.sh rename to integration-tests/bats/compatibility/corona-virus-test.sh diff --git a/bats/compatibility/migration_test_files/helper/common.bash b/integration-tests/bats/compatibility/migration_test_files/helper/common.bash similarity index 100% rename from bats/compatibility/migration_test_files/helper/common.bash rename to integration-tests/bats/compatibility/migration_test_files/helper/common.bash diff --git a/bats/compatibility/migration_test_files/helper/windows-compat.bash b/integration-tests/bats/compatibility/migration_test_files/helper/windows-compat.bash similarity index 100% rename from bats/compatibility/migration_test_files/helper/windows-compat.bash rename to integration-tests/bats/compatibility/migration_test_files/helper/windows-compat.bash diff --git a/bats/compatibility/migration_test_files/migrate-push-pull.sh b/integration-tests/bats/compatibility/migration_test_files/migrate-push-pull.sh similarity index 100% rename from bats/compatibility/migration_test_files/migrate-push-pull.sh rename to integration-tests/bats/compatibility/migration_test_files/migrate-push-pull.sh diff --git a/bats/compatibility/migration_test_files/migrate.bats b/integration-tests/bats/compatibility/migration_test_files/migrate.bats similarity index 100% rename from bats/compatibility/migration_test_files/migrate.bats rename to integration-tests/bats/compatibility/migration_test_files/migrate.bats diff --git a/bats/compatibility/migration_test_files/setup_repo.sh b/integration-tests/bats/compatibility/migration_test_files/setup_repo.sh similarity index 100% rename from bats/compatibility/migration_test_files/setup_repo.sh rename to integration-tests/bats/compatibility/migration_test_files/setup_repo.sh diff --git a/bats/compatibility/runner.sh b/integration-tests/bats/compatibility/runner.sh similarity index 100% rename from bats/compatibility/runner.sh rename to integration-tests/bats/compatibility/runner.sh diff --git a/bats/compatibility/test_files/bats/compatibility.bats b/integration-tests/bats/compatibility/test_files/bats/compatibility.bats similarity index 100% rename from bats/compatibility/test_files/bats/compatibility.bats rename to integration-tests/bats/compatibility/test_files/bats/compatibility.bats diff --git a/bats/compatibility/test_files/bats/helper/common.bash b/integration-tests/bats/compatibility/test_files/bats/helper/common.bash similarity index 100% rename from bats/compatibility/test_files/bats/helper/common.bash rename to integration-tests/bats/compatibility/test_files/bats/helper/common.bash diff --git a/bats/compatibility/test_files/bats/helper/windows-compat.bash b/integration-tests/bats/compatibility/test_files/bats/helper/windows-compat.bash similarity index 100% rename from bats/compatibility/test_files/bats/helper/windows-compat.bash rename to integration-tests/bats/compatibility/test_files/bats/helper/windows-compat.bash diff --git a/bats/compatibility/test_files/dolt_versions.txt b/integration-tests/bats/compatibility/test_files/dolt_versions.txt similarity index 100% rename from bats/compatibility/test_files/dolt_versions.txt rename to integration-tests/bats/compatibility/test_files/dolt_versions.txt diff --git a/bats/compatibility/test_files/setup_repo.sh b/integration-tests/bats/compatibility/test_files/setup_repo.sh similarity index 100% rename from bats/compatibility/test_files/setup_repo.sh rename to integration-tests/bats/compatibility/test_files/setup_repo.sh diff --git a/bats/config.bats b/integration-tests/bats/config.bats similarity index 100% rename from bats/config.bats rename to integration-tests/bats/config.bats diff --git a/bats/conflict-detection.bats b/integration-tests/bats/conflict-detection.bats similarity index 100% rename from bats/conflict-detection.bats rename to integration-tests/bats/conflict-detection.bats diff --git a/bats/cp-and-mv.bats b/integration-tests/bats/cp-and-mv.bats similarity index 100% rename from bats/cp-and-mv.bats rename to integration-tests/bats/cp-and-mv.bats diff --git a/bats/create-views.bats b/integration-tests/bats/create-views.bats similarity index 100% rename from bats/create-views.bats rename to integration-tests/bats/create-views.bats diff --git a/bats/creds.bats b/integration-tests/bats/creds.bats similarity index 100% rename from bats/creds.bats rename to integration-tests/bats/creds.bats diff --git a/bats/default-values.bats b/integration-tests/bats/default-values.bats similarity index 100% rename from bats/default-values.bats rename to integration-tests/bats/default-values.bats diff --git a/bats/diff.bats b/integration-tests/bats/diff.bats similarity index 100% rename from bats/diff.bats rename to integration-tests/bats/diff.bats diff --git a/bats/docs.bats b/integration-tests/bats/docs.bats similarity index 100% rename from bats/docs.bats rename to integration-tests/bats/docs.bats diff --git a/bats/empty-repo.bats b/integration-tests/bats/empty-repo.bats similarity index 100% rename from bats/empty-repo.bats rename to integration-tests/bats/empty-repo.bats diff --git a/bats/export-tables.bats b/integration-tests/bats/export-tables.bats similarity index 100% rename from bats/export-tables.bats rename to integration-tests/bats/export-tables.bats diff --git a/bats/feature-version.bats b/integration-tests/bats/feature-version.bats similarity index 100% rename from bats/feature-version.bats rename to integration-tests/bats/feature-version.bats diff --git a/bats/filter-branch.bats b/integration-tests/bats/filter-branch.bats similarity index 100% rename from bats/filter-branch.bats rename to integration-tests/bats/filter-branch.bats diff --git a/bats/foreign-keys.bats b/integration-tests/bats/foreign-keys.bats similarity index 100% rename from bats/foreign-keys.bats rename to integration-tests/bats/foreign-keys.bats diff --git a/bats/garbage_collection.bats b/integration-tests/bats/garbage_collection.bats similarity index 100% rename from bats/garbage_collection.bats rename to integration-tests/bats/garbage_collection.bats diff --git a/bats/git-dolt.bats b/integration-tests/bats/git-dolt.bats similarity index 100% rename from bats/git-dolt.bats rename to integration-tests/bats/git-dolt.bats diff --git a/bats/helper/1pk5col-ints.csv b/integration-tests/bats/helper/1pk5col-ints.csv similarity index 100% rename from bats/helper/1pk5col-ints.csv rename to integration-tests/bats/helper/1pk5col-ints.csv diff --git a/bats/helper/1pk5col-ints.json b/integration-tests/bats/helper/1pk5col-ints.json similarity index 100% rename from bats/helper/1pk5col-ints.json rename to integration-tests/bats/helper/1pk5col-ints.json diff --git a/bats/helper/1pk5col-ints.psv b/integration-tests/bats/helper/1pk5col-ints.psv similarity index 100% rename from bats/helper/1pk5col-ints.psv rename to integration-tests/bats/helper/1pk5col-ints.psv diff --git a/bats/helper/1pk5col-ints.sql b/integration-tests/bats/helper/1pk5col-ints.sql similarity index 100% rename from bats/helper/1pk5col-ints.sql rename to integration-tests/bats/helper/1pk5col-ints.sql diff --git a/bats/helper/1pk5col-strings-newlines.csv b/integration-tests/bats/helper/1pk5col-strings-newlines.csv similarity index 100% rename from bats/helper/1pk5col-strings-newlines.csv rename to integration-tests/bats/helper/1pk5col-strings-newlines.csv diff --git a/bats/helper/1pk5col-strings.csv b/integration-tests/bats/helper/1pk5col-strings.csv similarity index 100% rename from bats/helper/1pk5col-strings.csv rename to integration-tests/bats/helper/1pk5col-strings.csv diff --git a/bats/helper/1pksupportedtypes.csv b/integration-tests/bats/helper/1pksupportedtypes.csv similarity index 100% rename from bats/helper/1pksupportedtypes.csv rename to integration-tests/bats/helper/1pksupportedtypes.csv diff --git a/bats/helper/2pk5col-ints.csv b/integration-tests/bats/helper/2pk5col-ints.csv similarity index 100% rename from bats/helper/2pk5col-ints.csv rename to integration-tests/bats/helper/2pk5col-ints.csv diff --git a/bats/helper/bad-characters.csv b/integration-tests/bats/helper/bad-characters.csv similarity index 100% rename from bats/helper/bad-characters.csv rename to integration-tests/bats/helper/bad-characters.csv diff --git a/bats/helper/bad.csv b/integration-tests/bats/helper/bad.csv similarity index 100% rename from bats/helper/bad.csv rename to integration-tests/bats/helper/bad.csv diff --git a/bats/helper/bad.data b/integration-tests/bats/helper/bad.data similarity index 100% rename from bats/helper/bad.data rename to integration-tests/bats/helper/bad.data diff --git a/bats/helper/bad.xlsx b/integration-tests/bats/helper/bad.xlsx similarity index 100% rename from bats/helper/bad.xlsx rename to integration-tests/bats/helper/bad.xlsx diff --git a/bats/helper/caps-column-names.csv b/integration-tests/bats/helper/caps-column-names.csv similarity index 100% rename from bats/helper/caps-column-names.csv rename to integration-tests/bats/helper/caps-column-names.csv diff --git a/bats/helper/common.bash b/integration-tests/bats/helper/common.bash similarity index 100% rename from bats/helper/common.bash rename to integration-tests/bats/helper/common.bash diff --git a/bats/helper/employees-sch-bad.sql b/integration-tests/bats/helper/employees-sch-bad.sql similarity index 100% rename from bats/helper/employees-sch-bad.sql rename to integration-tests/bats/helper/employees-sch-bad.sql diff --git a/bats/helper/employees-sch.sql b/integration-tests/bats/helper/employees-sch.sql similarity index 100% rename from bats/helper/employees-sch.sql rename to integration-tests/bats/helper/employees-sch.sql diff --git a/bats/helper/employees-tbl-bad.json b/integration-tests/bats/helper/employees-tbl-bad.json similarity index 100% rename from bats/helper/employees-tbl-bad.json rename to integration-tests/bats/helper/employees-tbl-bad.json diff --git a/bats/helper/employees-tbl-new.json b/integration-tests/bats/helper/employees-tbl-new.json similarity index 100% rename from bats/helper/employees-tbl-new.json rename to integration-tests/bats/helper/employees-tbl-new.json diff --git a/bats/helper/employees-tbl-schema-unordered.csv b/integration-tests/bats/helper/employees-tbl-schema-unordered.csv similarity index 100% rename from bats/helper/employees-tbl-schema-unordered.csv rename to integration-tests/bats/helper/employees-tbl-schema-unordered.csv diff --git a/bats/helper/employees-tbl-schema-unordered.json b/integration-tests/bats/helper/employees-tbl-schema-unordered.json similarity index 100% rename from bats/helper/employees-tbl-schema-unordered.json rename to integration-tests/bats/helper/employees-tbl-schema-unordered.json diff --git a/bats/helper/employees-tbl-schema-wrong.csv b/integration-tests/bats/helper/employees-tbl-schema-wrong.csv similarity index 100% rename from bats/helper/employees-tbl-schema-wrong.csv rename to integration-tests/bats/helper/employees-tbl-schema-wrong.csv diff --git a/bats/helper/employees-tbl-schema-wrong.json b/integration-tests/bats/helper/employees-tbl-schema-wrong.json similarity index 100% rename from bats/helper/employees-tbl-schema-wrong.json rename to integration-tests/bats/helper/employees-tbl-schema-wrong.json diff --git a/bats/helper/employees-tbl.json b/integration-tests/bats/helper/employees-tbl.json similarity index 100% rename from bats/helper/employees-tbl.json rename to integration-tests/bats/helper/employees-tbl.json diff --git a/bats/helper/employees.xlsx b/integration-tests/bats/helper/employees.xlsx similarity index 100% rename from bats/helper/employees.xlsx rename to integration-tests/bats/helper/employees.xlsx diff --git a/bats/helper/empty-strings-null-values.json b/integration-tests/bats/helper/empty-strings-null-values.json similarity index 100% rename from bats/helper/empty-strings-null-values.json rename to integration-tests/bats/helper/empty-strings-null-values.json diff --git a/bats/helper/index_onepk.csv b/integration-tests/bats/helper/index_onepk.csv similarity index 100% rename from bats/helper/index_onepk.csv rename to integration-tests/bats/helper/index_onepk.csv diff --git a/bats/helper/index_onepk_non_unique.csv b/integration-tests/bats/helper/index_onepk_non_unique.csv similarity index 100% rename from bats/helper/index_onepk_non_unique.csv rename to integration-tests/bats/helper/index_onepk_non_unique.csv diff --git a/bats/helper/known-decapitated.jwk b/integration-tests/bats/helper/known-decapitated.jwk similarity index 100% rename from bats/helper/known-decapitated.jwk rename to integration-tests/bats/helper/known-decapitated.jwk diff --git a/bats/helper/known-good.jwk b/integration-tests/bats/helper/known-good.jwk similarity index 100% rename from bats/helper/known-good.jwk rename to integration-tests/bats/helper/known-good.jwk diff --git a/bats/helper/known-truncated.jwk b/integration-tests/bats/helper/known-truncated.jwk similarity index 100% rename from bats/helper/known-truncated.jwk rename to integration-tests/bats/helper/known-truncated.jwk diff --git a/bats/helper/old_dolt_schemas/config.json b/integration-tests/bats/helper/old_dolt_schemas/config.json similarity index 100% rename from bats/helper/old_dolt_schemas/config.json rename to integration-tests/bats/helper/old_dolt_schemas/config.json diff --git a/bats/helper/old_dolt_schemas/noms/4bujnjuatdli0klda7ucot0tl836jujt b/integration-tests/bats/helper/old_dolt_schemas/noms/4bujnjuatdli0klda7ucot0tl836jujt similarity index 100% rename from bats/helper/old_dolt_schemas/noms/4bujnjuatdli0klda7ucot0tl836jujt rename to integration-tests/bats/helper/old_dolt_schemas/noms/4bujnjuatdli0klda7ucot0tl836jujt diff --git a/bats/helper/old_dolt_schemas/noms/63c0dojobm5j7arp99hiq78hj1rtp7m5 b/integration-tests/bats/helper/old_dolt_schemas/noms/63c0dojobm5j7arp99hiq78hj1rtp7m5 similarity index 100% rename from bats/helper/old_dolt_schemas/noms/63c0dojobm5j7arp99hiq78hj1rtp7m5 rename to integration-tests/bats/helper/old_dolt_schemas/noms/63c0dojobm5j7arp99hiq78hj1rtp7m5 diff --git a/bats/helper/old_dolt_schemas/noms/LOCK b/integration-tests/bats/helper/old_dolt_schemas/noms/LOCK similarity index 100% rename from bats/helper/old_dolt_schemas/noms/LOCK rename to integration-tests/bats/helper/old_dolt_schemas/noms/LOCK diff --git a/bats/helper/old_dolt_schemas/noms/aum9p7826iqaeq0pjtqlcn56hoj5nhht b/integration-tests/bats/helper/old_dolt_schemas/noms/aum9p7826iqaeq0pjtqlcn56hoj5nhht similarity index 100% rename from bats/helper/old_dolt_schemas/noms/aum9p7826iqaeq0pjtqlcn56hoj5nhht rename to integration-tests/bats/helper/old_dolt_schemas/noms/aum9p7826iqaeq0pjtqlcn56hoj5nhht diff --git a/bats/helper/old_dolt_schemas/noms/chghnlvugtiui6khfo29cpfnfr3166qc b/integration-tests/bats/helper/old_dolt_schemas/noms/chghnlvugtiui6khfo29cpfnfr3166qc similarity index 100% rename from bats/helper/old_dolt_schemas/noms/chghnlvugtiui6khfo29cpfnfr3166qc rename to integration-tests/bats/helper/old_dolt_schemas/noms/chghnlvugtiui6khfo29cpfnfr3166qc diff --git a/bats/helper/old_dolt_schemas/noms/d0b8ibrrjvvv3f0mtd7hathtjq2vhig9 b/integration-tests/bats/helper/old_dolt_schemas/noms/d0b8ibrrjvvv3f0mtd7hathtjq2vhig9 similarity index 100% rename from bats/helper/old_dolt_schemas/noms/d0b8ibrrjvvv3f0mtd7hathtjq2vhig9 rename to integration-tests/bats/helper/old_dolt_schemas/noms/d0b8ibrrjvvv3f0mtd7hathtjq2vhig9 diff --git a/bats/helper/old_dolt_schemas/noms/erturgf7to0f6r8prlbllflbshg5li4n b/integration-tests/bats/helper/old_dolt_schemas/noms/erturgf7to0f6r8prlbllflbshg5li4n similarity index 100% rename from bats/helper/old_dolt_schemas/noms/erturgf7to0f6r8prlbllflbshg5li4n rename to integration-tests/bats/helper/old_dolt_schemas/noms/erturgf7to0f6r8prlbllflbshg5li4n diff --git a/bats/helper/old_dolt_schemas/noms/manifest b/integration-tests/bats/helper/old_dolt_schemas/noms/manifest similarity index 100% rename from bats/helper/old_dolt_schemas/noms/manifest rename to integration-tests/bats/helper/old_dolt_schemas/noms/manifest diff --git a/bats/helper/old_dolt_schemas/noms/oik6v50p7q6as4t7qg7f1i06iomt9vn9 b/integration-tests/bats/helper/old_dolt_schemas/noms/oik6v50p7q6as4t7qg7f1i06iomt9vn9 similarity index 100% rename from bats/helper/old_dolt_schemas/noms/oik6v50p7q6as4t7qg7f1i06iomt9vn9 rename to integration-tests/bats/helper/old_dolt_schemas/noms/oik6v50p7q6as4t7qg7f1i06iomt9vn9 diff --git a/bats/helper/old_dolt_schemas/noms/oktjimrpqi8m9dbpt3c7ikoaolhgtr2n b/integration-tests/bats/helper/old_dolt_schemas/noms/oktjimrpqi8m9dbpt3c7ikoaolhgtr2n similarity index 100% rename from bats/helper/old_dolt_schemas/noms/oktjimrpqi8m9dbpt3c7ikoaolhgtr2n rename to integration-tests/bats/helper/old_dolt_schemas/noms/oktjimrpqi8m9dbpt3c7ikoaolhgtr2n diff --git a/bats/helper/old_dolt_schemas/noms/qe0mct6rf8puhdnqecm185p63dacaqrt b/integration-tests/bats/helper/old_dolt_schemas/noms/qe0mct6rf8puhdnqecm185p63dacaqrt similarity index 100% rename from bats/helper/old_dolt_schemas/noms/qe0mct6rf8puhdnqecm185p63dacaqrt rename to integration-tests/bats/helper/old_dolt_schemas/noms/qe0mct6rf8puhdnqecm185p63dacaqrt diff --git a/bats/helper/old_dolt_schemas/noms/ro000svvgga0k7hatg7fta9j8ismtc3b b/integration-tests/bats/helper/old_dolt_schemas/noms/ro000svvgga0k7hatg7fta9j8ismtc3b similarity index 100% rename from bats/helper/old_dolt_schemas/noms/ro000svvgga0k7hatg7fta9j8ismtc3b rename to integration-tests/bats/helper/old_dolt_schemas/noms/ro000svvgga0k7hatg7fta9j8ismtc3b diff --git a/bats/helper/old_dolt_schemas/noms/u9c6ttq6ddrgqdfbod9pg2vv79ab6crt b/integration-tests/bats/helper/old_dolt_schemas/noms/u9c6ttq6ddrgqdfbod9pg2vv79ab6crt similarity index 100% rename from bats/helper/old_dolt_schemas/noms/u9c6ttq6ddrgqdfbod9pg2vv79ab6crt rename to integration-tests/bats/helper/old_dolt_schemas/noms/u9c6ttq6ddrgqdfbod9pg2vv79ab6crt diff --git a/bats/helper/old_dolt_schemas/repo_state.json b/integration-tests/bats/helper/old_dolt_schemas/repo_state.json similarity index 100% rename from bats/helper/old_dolt_schemas/repo_state.json rename to integration-tests/bats/helper/old_dolt_schemas/repo_state.json diff --git a/bats/helper/pytest.py b/integration-tests/bats/helper/pytest.py similarity index 100% rename from bats/helper/pytest.py rename to integration-tests/bats/helper/pytest.py diff --git a/bats/helper/queries/1pksupportedtypes/add.sql b/integration-tests/bats/helper/queries/1pksupportedtypes/add.sql similarity index 100% rename from bats/helper/queries/1pksupportedtypes/add.sql rename to integration-tests/bats/helper/queries/1pksupportedtypes/add.sql diff --git a/bats/helper/queries/1pksupportedtypes/create_table.sql b/integration-tests/bats/helper/queries/1pksupportedtypes/create_table.sql similarity index 100% rename from bats/helper/queries/1pksupportedtypes/create_table.sql rename to integration-tests/bats/helper/queries/1pksupportedtypes/create_table.sql diff --git a/bats/helper/queries/1pksupportedtypes/delete.sql b/integration-tests/bats/helper/queries/1pksupportedtypes/delete.sql similarity index 100% rename from bats/helper/queries/1pksupportedtypes/delete.sql rename to integration-tests/bats/helper/queries/1pksupportedtypes/delete.sql diff --git a/bats/helper/queries/1pksupportedtypes/update.sql b/integration-tests/bats/helper/queries/1pksupportedtypes/update.sql similarity index 100% rename from bats/helper/queries/1pksupportedtypes/update.sql rename to integration-tests/bats/helper/queries/1pksupportedtypes/update.sql diff --git a/bats/helper/queries/2pk5col-ints/add.sql b/integration-tests/bats/helper/queries/2pk5col-ints/add.sql similarity index 100% rename from bats/helper/queries/2pk5col-ints/add.sql rename to integration-tests/bats/helper/queries/2pk5col-ints/add.sql diff --git a/bats/helper/queries/2pk5col-ints/all_pk_update.sql b/integration-tests/bats/helper/queries/2pk5col-ints/all_pk_update.sql similarity index 100% rename from bats/helper/queries/2pk5col-ints/all_pk_update.sql rename to integration-tests/bats/helper/queries/2pk5col-ints/all_pk_update.sql diff --git a/bats/helper/queries/2pk5col-ints/create_table.sql b/integration-tests/bats/helper/queries/2pk5col-ints/create_table.sql similarity index 100% rename from bats/helper/queries/2pk5col-ints/create_table.sql rename to integration-tests/bats/helper/queries/2pk5col-ints/create_table.sql diff --git a/bats/helper/queries/2pk5col-ints/delete.sql b/integration-tests/bats/helper/queries/2pk5col-ints/delete.sql similarity index 100% rename from bats/helper/queries/2pk5col-ints/delete.sql rename to integration-tests/bats/helper/queries/2pk5col-ints/delete.sql diff --git a/bats/helper/queries/2pk5col-ints/single_pk_update.sql b/integration-tests/bats/helper/queries/2pk5col-ints/single_pk_update.sql similarity index 100% rename from bats/helper/queries/2pk5col-ints/single_pk_update.sql rename to integration-tests/bats/helper/queries/2pk5col-ints/single_pk_update.sql diff --git a/bats/helper/queries/2pk5col-ints/update.sql b/integration-tests/bats/helper/queries/2pk5col-ints/update.sql similarity index 100% rename from bats/helper/queries/2pk5col-ints/update.sql rename to integration-tests/bats/helper/queries/2pk5col-ints/update.sql diff --git a/bats/helper/query-server-common.bash b/integration-tests/bats/helper/query-server-common.bash similarity index 100% rename from bats/helper/query-server-common.bash rename to integration-tests/bats/helper/query-server-common.bash diff --git a/bats/helper/sql-reserved-column-name.csv b/integration-tests/bats/helper/sql-reserved-column-name.csv similarity index 100% rename from bats/helper/sql-reserved-column-name.csv rename to integration-tests/bats/helper/sql-reserved-column-name.csv diff --git a/bats/helper/testEvents/Epb8UsWYXQCy2c0xeLDl3g.devts b/integration-tests/bats/helper/testEvents/Epb8UsWYXQCy2c0xeLDl3g.devts similarity index 100% rename from bats/helper/testEvents/Epb8UsWYXQCy2c0xeLDl3g.devts rename to integration-tests/bats/helper/testEvents/Epb8UsWYXQCy2c0xeLDl3g.devts diff --git a/bats/helper/testEvents/QkPcFh6D8c7qvaP8jWULqQ.devts b/integration-tests/bats/helper/testEvents/QkPcFh6D8c7qvaP8jWULqQ.devts similarity index 100% rename from bats/helper/testEvents/QkPcFh6D8c7qvaP8jWULqQ.devts rename to integration-tests/bats/helper/testEvents/QkPcFh6D8c7qvaP8jWULqQ.devts diff --git a/bats/helper/testEvents/SQMaInRFa-u0fBtNVZJFJA.devts b/integration-tests/bats/helper/testEvents/SQMaInRFa-u0fBtNVZJFJA.devts similarity index 100% rename from bats/helper/testEvents/SQMaInRFa-u0fBtNVZJFJA.devts rename to integration-tests/bats/helper/testEvents/SQMaInRFa-u0fBtNVZJFJA.devts diff --git a/bats/helper/testEvents/_BWNaFSa7hsRAUydECsSPQ.devts b/integration-tests/bats/helper/testEvents/_BWNaFSa7hsRAUydECsSPQ.devts similarity index 100% rename from bats/helper/testEvents/_BWNaFSa7hsRAUydECsSPQ.devts rename to integration-tests/bats/helper/testEvents/_BWNaFSa7hsRAUydECsSPQ.devts diff --git a/bats/helper/testdata/20200113/.dolt/config.json b/integration-tests/bats/helper/testdata/20200113/.dolt/config.json similarity index 100% rename from bats/helper/testdata/20200113/.dolt/config.json rename to integration-tests/bats/helper/testdata/20200113/.dolt/config.json diff --git a/bats/helper/testdata/20200113/.dolt/noms/09hv7tllti9b3hfi7u5m3e7lpbne390a b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/09hv7tllti9b3hfi7u5m3e7lpbne390a similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/09hv7tllti9b3hfi7u5m3e7lpbne390a rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/09hv7tllti9b3hfi7u5m3e7lpbne390a diff --git a/bats/helper/testdata/20200113/.dolt/noms/0kl39j0i7gljemj93loojdhdbsj9lb36 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/0kl39j0i7gljemj93loojdhdbsj9lb36 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/0kl39j0i7gljemj93loojdhdbsj9lb36 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/0kl39j0i7gljemj93loojdhdbsj9lb36 diff --git a/bats/helper/testdata/20200113/.dolt/noms/1nrr0bod1960bccqc6c2med68hod5gc7 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/1nrr0bod1960bccqc6c2med68hod5gc7 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/1nrr0bod1960bccqc6c2med68hod5gc7 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/1nrr0bod1960bccqc6c2med68hod5gc7 diff --git a/bats/helper/testdata/20200113/.dolt/noms/1rnurg4no9s6s23mdq8vvfmj0cik47db b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/1rnurg4no9s6s23mdq8vvfmj0cik47db similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/1rnurg4no9s6s23mdq8vvfmj0cik47db rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/1rnurg4no9s6s23mdq8vvfmj0cik47db diff --git a/bats/helper/testdata/20200113/.dolt/noms/3dsltc9vis2m6o89bv0dh482pfme30ss b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/3dsltc9vis2m6o89bv0dh482pfme30ss similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/3dsltc9vis2m6o89bv0dh482pfme30ss rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/3dsltc9vis2m6o89bv0dh482pfme30ss diff --git a/bats/helper/testdata/20200113/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt diff --git a/bats/helper/testdata/20200113/.dolt/noms/5im08tb1mu140r7kvtrd04u8ub5qk607 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/5im08tb1mu140r7kvtrd04u8ub5qk607 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/5im08tb1mu140r7kvtrd04u8ub5qk607 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/5im08tb1mu140r7kvtrd04u8ub5qk607 diff --git a/bats/helper/testdata/20200113/.dolt/noms/6739m2utlhl1k98f4o2fqmgtm12ino4t b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/6739m2utlhl1k98f4o2fqmgtm12ino4t similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/6739m2utlhl1k98f4o2fqmgtm12ino4t rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/6739m2utlhl1k98f4o2fqmgtm12ino4t diff --git a/bats/helper/testdata/20200113/.dolt/noms/6oc2i2n9ln25n8go78dalvo3e9er9mg3 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/6oc2i2n9ln25n8go78dalvo3e9er9mg3 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/6oc2i2n9ln25n8go78dalvo3e9er9mg3 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/6oc2i2n9ln25n8go78dalvo3e9er9mg3 diff --git a/bats/helper/testdata/20200113/.dolt/noms/7er6962c841ghn8j0a357ujde9daq3mu b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/7er6962c841ghn8j0a357ujde9daq3mu similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/7er6962c841ghn8j0a357ujde9daq3mu rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/7er6962c841ghn8j0a357ujde9daq3mu diff --git a/bats/helper/testdata/20200113/.dolt/noms/7vu480853r3b0hitt89l7gc3r854fb53 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/7vu480853r3b0hitt89l7gc3r854fb53 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/7vu480853r3b0hitt89l7gc3r854fb53 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/7vu480853r3b0hitt89l7gc3r854fb53 diff --git a/bats/helper/testdata/20200113/.dolt/noms/89knkh4sejb7tf05gqq01osftlbsmdq1 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/89knkh4sejb7tf05gqq01osftlbsmdq1 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/89knkh4sejb7tf05gqq01osftlbsmdq1 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/89knkh4sejb7tf05gqq01osftlbsmdq1 diff --git a/bats/helper/testdata/20200113/.dolt/noms/9guvpb6l55h1t9aqaa9b7qnp1dnnelkd b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/9guvpb6l55h1t9aqaa9b7qnp1dnnelkd similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/9guvpb6l55h1t9aqaa9b7qnp1dnnelkd rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/9guvpb6l55h1t9aqaa9b7qnp1dnnelkd diff --git a/bats/helper/testdata/20200113/.dolt/noms/9ibrf56gr6gsgr7cpnda4au9o0vd0412 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/9ibrf56gr6gsgr7cpnda4au9o0vd0412 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/9ibrf56gr6gsgr7cpnda4au9o0vd0412 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/9ibrf56gr6gsgr7cpnda4au9o0vd0412 diff --git a/bats/helper/testdata/20200113/.dolt/noms/LOCK b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/LOCK similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/LOCK rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/LOCK diff --git a/bats/helper/testdata/20200113/.dolt/noms/a8hqijvam2c6r9qvbffsdj5r55bis0mn b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/a8hqijvam2c6r9qvbffsdj5r55bis0mn similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/a8hqijvam2c6r9qvbffsdj5r55bis0mn rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/a8hqijvam2c6r9qvbffsdj5r55bis0mn diff --git a/bats/helper/testdata/20200113/.dolt/noms/a9307merr53dd71vj459m7qo6rk435na b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/a9307merr53dd71vj459m7qo6rk435na similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/a9307merr53dd71vj459m7qo6rk435na rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/a9307merr53dd71vj459m7qo6rk435na diff --git a/bats/helper/testdata/20200113/.dolt/noms/ag7kv5tuc4jvovmas7r5kel32dd94g86 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ag7kv5tuc4jvovmas7r5kel32dd94g86 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/ag7kv5tuc4jvovmas7r5kel32dd94g86 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/ag7kv5tuc4jvovmas7r5kel32dd94g86 diff --git a/bats/helper/testdata/20200113/.dolt/noms/c8a3b64elue3121ng0rgeagcnf48fbat b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8a3b64elue3121ng0rgeagcnf48fbat similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/c8a3b64elue3121ng0rgeagcnf48fbat rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8a3b64elue3121ng0rgeagcnf48fbat diff --git a/bats/helper/testdata/20200113/.dolt/noms/c8dirve58o6npl3aufbupn3c2pt55el4 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8dirve58o6npl3aufbupn3c2pt55el4 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/c8dirve58o6npl3aufbupn3c2pt55el4 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8dirve58o6npl3aufbupn3c2pt55el4 diff --git a/bats/helper/testdata/20200113/.dolt/noms/ca9rtjbjd7n5pkodo3rsl6bon0s8qe4j b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ca9rtjbjd7n5pkodo3rsl6bon0s8qe4j similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/ca9rtjbjd7n5pkodo3rsl6bon0s8qe4j rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/ca9rtjbjd7n5pkodo3rsl6bon0s8qe4j diff --git a/bats/helper/testdata/20200113/.dolt/noms/csopsqdj2urggh85gbsfth4c9lf4r8vb b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/csopsqdj2urggh85gbsfth4c9lf4r8vb similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/csopsqdj2urggh85gbsfth4c9lf4r8vb rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/csopsqdj2urggh85gbsfth4c9lf4r8vb diff --git a/bats/helper/testdata/20200113/.dolt/noms/di7sdosugcarnn353e8ldbnlts9v42s5 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/di7sdosugcarnn353e8ldbnlts9v42s5 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/di7sdosugcarnn353e8ldbnlts9v42s5 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/di7sdosugcarnn353e8ldbnlts9v42s5 diff --git a/bats/helper/testdata/20200113/.dolt/noms/eiit9a47igil0id02vhgpq4g72ga3dha b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/eiit9a47igil0id02vhgpq4g72ga3dha similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/eiit9a47igil0id02vhgpq4g72ga3dha rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/eiit9a47igil0id02vhgpq4g72ga3dha diff --git a/bats/helper/testdata/20200113/.dolt/noms/es7vlqed0665gq9es3ns2uqeh75bkerc b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/es7vlqed0665gq9es3ns2uqeh75bkerc similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/es7vlqed0665gq9es3ns2uqeh75bkerc rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/es7vlqed0665gq9es3ns2uqeh75bkerc diff --git a/bats/helper/testdata/20200113/.dolt/noms/fkes7bk2bl0p9cvfgk3dd7uf6p4cqcm1 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/fkes7bk2bl0p9cvfgk3dd7uf6p4cqcm1 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/fkes7bk2bl0p9cvfgk3dd7uf6p4cqcm1 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/fkes7bk2bl0p9cvfgk3dd7uf6p4cqcm1 diff --git a/bats/helper/testdata/20200113/.dolt/noms/frc0ef452fhh97o534e7lol2b427lk56 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/frc0ef452fhh97o534e7lol2b427lk56 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/frc0ef452fhh97o534e7lol2b427lk56 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/frc0ef452fhh97o534e7lol2b427lk56 diff --git a/bats/helper/testdata/20200113/.dolt/noms/g2slg3mhtfb5m2tk00t8mor5lkboqj2m b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/g2slg3mhtfb5m2tk00t8mor5lkboqj2m similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/g2slg3mhtfb5m2tk00t8mor5lkboqj2m rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/g2slg3mhtfb5m2tk00t8mor5lkboqj2m diff --git a/bats/helper/testdata/20200113/.dolt/noms/glc2mu652o0pt893a79j30tc6kgvk453 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/glc2mu652o0pt893a79j30tc6kgvk453 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/glc2mu652o0pt893a79j30tc6kgvk453 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/glc2mu652o0pt893a79j30tc6kgvk453 diff --git a/bats/helper/testdata/20200113/.dolt/noms/hgsmoadjsib12ml6e05or4q5urv9lt7l b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/hgsmoadjsib12ml6e05or4q5urv9lt7l similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/hgsmoadjsib12ml6e05or4q5urv9lt7l rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/hgsmoadjsib12ml6e05or4q5urv9lt7l diff --git a/bats/helper/testdata/20200113/.dolt/noms/ie2tcnurro57vl8urvucbjdrmmf9bo0h b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ie2tcnurro57vl8urvucbjdrmmf9bo0h similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/ie2tcnurro57vl8urvucbjdrmmf9bo0h rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/ie2tcnurro57vl8urvucbjdrmmf9bo0h diff --git a/bats/helper/testdata/20200113/.dolt/noms/iellg8am40vu2tf61hbe7i0anhm76gtv b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/iellg8am40vu2tf61hbe7i0anhm76gtv similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/iellg8am40vu2tf61hbe7i0anhm76gtv rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/iellg8am40vu2tf61hbe7i0anhm76gtv diff --git a/bats/helper/testdata/20200113/.dolt/noms/jji5lv8nq265dpk6r11ug3gb6ih81hdr b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/jji5lv8nq265dpk6r11ug3gb6ih81hdr similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/jji5lv8nq265dpk6r11ug3gb6ih81hdr rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/jji5lv8nq265dpk6r11ug3gb6ih81hdr diff --git a/bats/helper/testdata/20200113/.dolt/noms/ju51cbttj99itbsbk2svu7sij2tu4rhl b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ju51cbttj99itbsbk2svu7sij2tu4rhl similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/ju51cbttj99itbsbk2svu7sij2tu4rhl rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/ju51cbttj99itbsbk2svu7sij2tu4rhl diff --git a/bats/helper/testdata/20200113/.dolt/noms/k3ksuke2vcb2hgatpdqbhildb8raab5p b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/k3ksuke2vcb2hgatpdqbhildb8raab5p similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/k3ksuke2vcb2hgatpdqbhildb8raab5p rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/k3ksuke2vcb2hgatpdqbhildb8raab5p diff --git a/bats/helper/testdata/20200113/.dolt/noms/kmjfnt24t2vf8e58u3r5insr7tfohm2e b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/kmjfnt24t2vf8e58u3r5insr7tfohm2e similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/kmjfnt24t2vf8e58u3r5insr7tfohm2e rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/kmjfnt24t2vf8e58u3r5insr7tfohm2e diff --git a/bats/helper/testdata/20200113/.dolt/noms/m297l94np7ub1bp8irhpf3eta6bpegr8 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/m297l94np7ub1bp8irhpf3eta6bpegr8 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/m297l94np7ub1bp8irhpf3eta6bpegr8 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/m297l94np7ub1bp8irhpf3eta6bpegr8 diff --git a/bats/helper/testdata/20200113/.dolt/noms/m3sn7rmfc0lbis3codosl1k46hpv0kod b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/m3sn7rmfc0lbis3codosl1k46hpv0kod similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/m3sn7rmfc0lbis3codosl1k46hpv0kod rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/m3sn7rmfc0lbis3codosl1k46hpv0kod diff --git a/bats/helper/testdata/20200113/.dolt/noms/manifest b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/manifest similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/manifest rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/manifest diff --git a/bats/helper/testdata/20200113/.dolt/noms/miv7sdaoglrgfs2rgafm77kr6h9cbgvn b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/miv7sdaoglrgfs2rgafm77kr6h9cbgvn similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/miv7sdaoglrgfs2rgafm77kr6h9cbgvn rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/miv7sdaoglrgfs2rgafm77kr6h9cbgvn diff --git a/bats/helper/testdata/20200113/.dolt/noms/ml7hl70ar993tc32gla4ttjar0ogka86 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ml7hl70ar993tc32gla4ttjar0ogka86 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/ml7hl70ar993tc32gla4ttjar0ogka86 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/ml7hl70ar993tc32gla4ttjar0ogka86 diff --git a/bats/helper/testdata/20200113/.dolt/noms/naromh9oel8c6dmmg6lvg61ot3gvomkv b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/naromh9oel8c6dmmg6lvg61ot3gvomkv similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/naromh9oel8c6dmmg6lvg61ot3gvomkv rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/naromh9oel8c6dmmg6lvg61ot3gvomkv diff --git a/bats/helper/testdata/20200113/.dolt/noms/oarahke38ufh3tmnfpafuvb51dfbhgmh b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/oarahke38ufh3tmnfpafuvb51dfbhgmh similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/oarahke38ufh3tmnfpafuvb51dfbhgmh rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/oarahke38ufh3tmnfpafuvb51dfbhgmh diff --git a/bats/helper/testdata/20200113/.dolt/noms/og4gt15c913id9e4iv7bcobjkn6aqn8d b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/og4gt15c913id9e4iv7bcobjkn6aqn8d similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/og4gt15c913id9e4iv7bcobjkn6aqn8d rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/og4gt15c913id9e4iv7bcobjkn6aqn8d diff --git a/bats/helper/testdata/20200113/.dolt/noms/ojdo9hafo3mvlko0cefqcom7os26utln b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ojdo9hafo3mvlko0cefqcom7os26utln similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/ojdo9hafo3mvlko0cefqcom7os26utln rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/ojdo9hafo3mvlko0cefqcom7os26utln diff --git a/bats/helper/testdata/20200113/.dolt/noms/os1po1dclurjkflegl02usl2r8rkg2cq b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/os1po1dclurjkflegl02usl2r8rkg2cq similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/os1po1dclurjkflegl02usl2r8rkg2cq rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/os1po1dclurjkflegl02usl2r8rkg2cq diff --git a/bats/helper/testdata/20200113/.dolt/noms/q5eq2e7gn1osgqg6bdqctgi7o7lapsik b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/q5eq2e7gn1osgqg6bdqctgi7o7lapsik similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/q5eq2e7gn1osgqg6bdqctgi7o7lapsik rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/q5eq2e7gn1osgqg6bdqctgi7o7lapsik diff --git a/bats/helper/testdata/20200113/.dolt/noms/qqc5268agbqc0nqdud6gn7m202teffnm b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/qqc5268agbqc0nqdud6gn7m202teffnm similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/qqc5268agbqc0nqdud6gn7m202teffnm rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/qqc5268agbqc0nqdud6gn7m202teffnm diff --git a/bats/helper/testdata/20200113/.dolt/noms/rcksm0pvt2fop4deb2tf881mo0vj4ih8 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/rcksm0pvt2fop4deb2tf881mo0vj4ih8 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/rcksm0pvt2fop4deb2tf881mo0vj4ih8 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/rcksm0pvt2fop4deb2tf881mo0vj4ih8 diff --git a/bats/helper/testdata/20200113/.dolt/noms/rrbqpqt3l59s17rbva7pjrqhitbe4cc2 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/rrbqpqt3l59s17rbva7pjrqhitbe4cc2 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/rrbqpqt3l59s17rbva7pjrqhitbe4cc2 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/rrbqpqt3l59s17rbva7pjrqhitbe4cc2 diff --git a/bats/helper/testdata/20200113/.dolt/noms/s69lvejsvg9so3l2nsquavmbai4dmu03 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/s69lvejsvg9so3l2nsquavmbai4dmu03 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/s69lvejsvg9so3l2nsquavmbai4dmu03 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/s69lvejsvg9so3l2nsquavmbai4dmu03 diff --git a/bats/helper/testdata/20200113/.dolt/noms/srlc19tj78ldn4hbb8duso90i1vugc59 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/srlc19tj78ldn4hbb8duso90i1vugc59 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/srlc19tj78ldn4hbb8duso90i1vugc59 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/srlc19tj78ldn4hbb8duso90i1vugc59 diff --git a/bats/helper/testdata/20200113/.dolt/noms/tmie2h7f80pblg0ojfk0v50qu8s97mpa b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/tmie2h7f80pblg0ojfk0v50qu8s97mpa similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/tmie2h7f80pblg0ojfk0v50qu8s97mpa rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/tmie2h7f80pblg0ojfk0v50qu8s97mpa diff --git a/bats/helper/testdata/20200113/.dolt/noms/u62g6ma6evirqjb11i0up0p1hppb50ou b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/u62g6ma6evirqjb11i0up0p1hppb50ou similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/u62g6ma6evirqjb11i0up0p1hppb50ou rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/u62g6ma6evirqjb11i0up0p1hppb50ou diff --git a/bats/helper/testdata/20200113/.dolt/noms/ug6l7o53ntp50f252u65cj96om411v14 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ug6l7o53ntp50f252u65cj96om411v14 similarity index 100% rename from bats/helper/testdata/20200113/.dolt/noms/ug6l7o53ntp50f252u65cj96om411v14 rename to integration-tests/bats/helper/testdata/20200113/.dolt/noms/ug6l7o53ntp50f252u65cj96om411v14 diff --git a/bats/helper/testdata/20200113/.dolt/repo_state.json b/integration-tests/bats/helper/testdata/20200113/.dolt/repo_state.json similarity index 100% rename from bats/helper/testdata/20200113/.dolt/repo_state.json rename to integration-tests/bats/helper/testdata/20200113/.dolt/repo_state.json diff --git a/bats/helper/testdata/20200113/README.md b/integration-tests/bats/helper/testdata/20200113/README.md similarity index 100% rename from bats/helper/testdata/20200113/README.md rename to integration-tests/bats/helper/testdata/20200113/README.md diff --git a/bats/helper/testdata/20200225/.dolt/config.json b/integration-tests/bats/helper/testdata/20200225/.dolt/config.json similarity index 100% rename from bats/helper/testdata/20200225/.dolt/config.json rename to integration-tests/bats/helper/testdata/20200225/.dolt/config.json diff --git a/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d diff --git a/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 diff --git a/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt diff --git a/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe diff --git a/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss diff --git a/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 diff --git a/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii diff --git a/bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt diff --git a/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 diff --git a/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv diff --git a/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln diff --git a/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr diff --git a/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s diff --git a/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq diff --git a/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq diff --git a/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 diff --git a/bats/helper/testdata/20200225/.dolt/noms/LOCK b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/LOCK similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/LOCK rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/LOCK diff --git a/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 diff --git a/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur diff --git a/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a diff --git a/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem diff --git a/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq diff --git a/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd diff --git a/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh diff --git a/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke diff --git a/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af diff --git a/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad diff --git a/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 diff --git a/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 diff --git a/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb diff --git a/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e diff --git a/bats/helper/testdata/20200225/.dolt/noms/manifest b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/manifest similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/manifest rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/manifest diff --git a/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 diff --git a/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 diff --git a/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 diff --git a/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif diff --git a/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran diff --git a/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko diff --git a/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 diff --git a/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r diff --git a/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u diff --git a/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo similarity index 100% rename from bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo rename to integration-tests/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo diff --git a/bats/helper/testdata/20200225/.dolt/repo_state.json b/integration-tests/bats/helper/testdata/20200225/.dolt/repo_state.json similarity index 100% rename from bats/helper/testdata/20200225/.dolt/repo_state.json rename to integration-tests/bats/helper/testdata/20200225/.dolt/repo_state.json diff --git a/bats/helper/testdata/20200225/LICENSE.md b/integration-tests/bats/helper/testdata/20200225/LICENSE.md similarity index 100% rename from bats/helper/testdata/20200225/LICENSE.md rename to integration-tests/bats/helper/testdata/20200225/LICENSE.md diff --git a/bats/helper/testdata/20200225/README.md b/integration-tests/bats/helper/testdata/20200225/README.md similarity index 100% rename from bats/helper/testdata/20200225/README.md rename to integration-tests/bats/helper/testdata/20200225/README.md diff --git a/bats/helper/testdata/README.md b/integration-tests/bats/helper/testdata/README.md similarity index 100% rename from bats/helper/testdata/README.md rename to integration-tests/bats/helper/testdata/README.md diff --git a/bats/helper/testdata/new_repo.sh b/integration-tests/bats/helper/testdata/new_repo.sh similarity index 100% rename from bats/helper/testdata/new_repo.sh rename to integration-tests/bats/helper/testdata/new_repo.sh diff --git a/bats/helper/windows-compat.bash b/integration-tests/bats/helper/windows-compat.bash similarity index 100% rename from bats/helper/windows-compat.bash rename to integration-tests/bats/helper/windows-compat.bash diff --git a/bats/import-create-tables.bats b/integration-tests/bats/import-create-tables.bats similarity index 100% rename from bats/import-create-tables.bats rename to integration-tests/bats/import-create-tables.bats diff --git a/bats/import-replace-tables.bats b/integration-tests/bats/import-replace-tables.bats similarity index 100% rename from bats/import-replace-tables.bats rename to integration-tests/bats/import-replace-tables.bats diff --git a/bats/import-update-tables.bats b/integration-tests/bats/import-update-tables.bats similarity index 100% rename from bats/import-update-tables.bats rename to integration-tests/bats/import-update-tables.bats diff --git a/bats/index-on-writes.bats b/integration-tests/bats/index-on-writes.bats similarity index 100% rename from bats/index-on-writes.bats rename to integration-tests/bats/index-on-writes.bats diff --git a/bats/index.bats b/integration-tests/bats/index.bats similarity index 100% rename from bats/index.bats rename to integration-tests/bats/index.bats diff --git a/bats/keyless.bats b/integration-tests/bats/keyless.bats similarity index 100% rename from bats/keyless.bats rename to integration-tests/bats/keyless.bats diff --git a/bats/localbs-remotes.bats b/integration-tests/bats/localbs-remotes.bats similarity index 100% rename from bats/localbs-remotes.bats rename to integration-tests/bats/localbs-remotes.bats diff --git a/bats/log.bats b/integration-tests/bats/log.bats similarity index 100% rename from bats/log.bats rename to integration-tests/bats/log.bats diff --git a/bats/merge.bats b/integration-tests/bats/merge.bats similarity index 100% rename from bats/merge.bats rename to integration-tests/bats/merge.bats diff --git a/bats/multiple-tables.bats b/integration-tests/bats/multiple-tables.bats similarity index 100% rename from bats/multiple-tables.bats rename to integration-tests/bats/multiple-tables.bats diff --git a/bats/no-repo.bats b/integration-tests/bats/no-repo.bats similarity index 100% rename from bats/no-repo.bats rename to integration-tests/bats/no-repo.bats diff --git a/bats/query-catalog.bats b/integration-tests/bats/query-catalog.bats similarity index 100% rename from bats/query-catalog.bats rename to integration-tests/bats/query-catalog.bats diff --git a/bats/regression-tests.bats b/integration-tests/bats/regression-tests.bats similarity index 100% rename from bats/regression-tests.bats rename to integration-tests/bats/regression-tests.bats diff --git a/bats/remotes-file-system.bats b/integration-tests/bats/remotes-file-system.bats similarity index 100% rename from bats/remotes-file-system.bats rename to integration-tests/bats/remotes-file-system.bats diff --git a/bats/remotes.bats b/integration-tests/bats/remotes.bats similarity index 100% rename from bats/remotes.bats rename to integration-tests/bats/remotes.bats diff --git a/bats/rename-tables.bats b/integration-tests/bats/rename-tables.bats similarity index 100% rename from bats/rename-tables.bats rename to integration-tests/bats/rename-tables.bats diff --git a/bats/schema-changes.bats b/integration-tests/bats/schema-changes.bats similarity index 100% rename from bats/schema-changes.bats rename to integration-tests/bats/schema-changes.bats diff --git a/bats/schema-export.bats b/integration-tests/bats/schema-export.bats similarity index 100% rename from bats/schema-export.bats rename to integration-tests/bats/schema-export.bats diff --git a/bats/schema-import.bats b/integration-tests/bats/schema-import.bats similarity index 100% rename from bats/schema-import.bats rename to integration-tests/bats/schema-import.bats diff --git a/bats/send-metrics.bats b/integration-tests/bats/send-metrics.bats similarity index 100% rename from bats/send-metrics.bats rename to integration-tests/bats/send-metrics.bats diff --git a/bats/server_multiclient_test.py b/integration-tests/bats/server_multiclient_test.py similarity index 100% rename from bats/server_multiclient_test.py rename to integration-tests/bats/server_multiclient_test.py diff --git a/bats/sql-add.bats b/integration-tests/bats/sql-add.bats similarity index 100% rename from bats/sql-add.bats rename to integration-tests/bats/sql-add.bats diff --git a/bats/sql-batch.bats b/integration-tests/bats/sql-batch.bats similarity index 100% rename from bats/sql-batch.bats rename to integration-tests/bats/sql-batch.bats diff --git a/bats/sql-checkout.bats b/integration-tests/bats/sql-checkout.bats similarity index 100% rename from bats/sql-checkout.bats rename to integration-tests/bats/sql-checkout.bats diff --git a/bats/sql-commit.bats b/integration-tests/bats/sql-commit.bats similarity index 100% rename from bats/sql-commit.bats rename to integration-tests/bats/sql-commit.bats diff --git a/bats/sql-conflicts.bats b/integration-tests/bats/sql-conflicts.bats similarity index 100% rename from bats/sql-conflicts.bats rename to integration-tests/bats/sql-conflicts.bats diff --git a/bats/sql-create-database.bats b/integration-tests/bats/sql-create-database.bats similarity index 100% rename from bats/sql-create-database.bats rename to integration-tests/bats/sql-create-database.bats diff --git a/bats/sql-create-tables.bats b/integration-tests/bats/sql-create-tables.bats similarity index 100% rename from bats/sql-create-tables.bats rename to integration-tests/bats/sql-create-tables.bats diff --git a/bats/sql-delimiter.expect b/integration-tests/bats/sql-delimiter.expect similarity index 100% rename from bats/sql-delimiter.expect rename to integration-tests/bats/sql-delimiter.expect diff --git a/bats/sql-diff.bats b/integration-tests/bats/sql-diff.bats similarity index 100% rename from bats/sql-diff.bats rename to integration-tests/bats/sql-diff.bats diff --git a/bats/sql-load-data.bats b/integration-tests/bats/sql-load-data.bats similarity index 100% rename from bats/sql-load-data.bats rename to integration-tests/bats/sql-load-data.bats diff --git a/bats/sql-merge.bats b/integration-tests/bats/sql-merge.bats similarity index 100% rename from bats/sql-merge.bats rename to integration-tests/bats/sql-merge.bats diff --git a/bats/sql-multi-db.bats b/integration-tests/bats/sql-multi-db.bats similarity index 100% rename from bats/sql-multi-db.bats rename to integration-tests/bats/sql-multi-db.bats diff --git a/bats/sql-reserved-column-name.bats b/integration-tests/bats/sql-reserved-column-name.bats similarity index 100% rename from bats/sql-reserved-column-name.bats rename to integration-tests/bats/sql-reserved-column-name.bats diff --git a/bats/sql-reset.bats b/integration-tests/bats/sql-reset.bats similarity index 100% rename from bats/sql-reset.bats rename to integration-tests/bats/sql-reset.bats diff --git a/bats/sql-server.bats b/integration-tests/bats/sql-server.bats similarity index 100% rename from bats/sql-server.bats rename to integration-tests/bats/sql-server.bats diff --git a/bats/sql-shell.bats b/integration-tests/bats/sql-shell.bats similarity index 100% rename from bats/sql-shell.bats rename to integration-tests/bats/sql-shell.bats diff --git a/bats/sql-shell.expect b/integration-tests/bats/sql-shell.expect similarity index 100% rename from bats/sql-shell.expect rename to integration-tests/bats/sql-shell.expect diff --git a/bats/sql-status.bats b/integration-tests/bats/sql-status.bats similarity index 100% rename from bats/sql-status.bats rename to integration-tests/bats/sql-status.bats diff --git a/bats/sql-works-after-failing-query.expect b/integration-tests/bats/sql-works-after-failing-query.expect similarity index 100% rename from bats/sql-works-after-failing-query.expect rename to integration-tests/bats/sql-works-after-failing-query.expect diff --git a/bats/sql.bats b/integration-tests/bats/sql.bats similarity index 100% rename from bats/sql.bats rename to integration-tests/bats/sql.bats diff --git a/bats/status.bats b/integration-tests/bats/status.bats similarity index 100% rename from bats/status.bats rename to integration-tests/bats/status.bats diff --git a/bats/system-tables.bats b/integration-tests/bats/system-tables.bats similarity index 100% rename from bats/system-tables.bats rename to integration-tests/bats/system-tables.bats diff --git a/bats/triggers.bats b/integration-tests/bats/triggers.bats similarity index 100% rename from bats/triggers.bats rename to integration-tests/bats/triggers.bats diff --git a/bats/types.bats b/integration-tests/bats/types.bats similarity index 100% rename from bats/types.bats rename to integration-tests/bats/types.bats diff --git a/bats/verify-constraints.bats b/integration-tests/bats/verify-constraints.bats similarity index 100% rename from bats/verify-constraints.bats rename to integration-tests/bats/verify-constraints.bats diff --git a/mysql-client-tests/.gitignore b/integration-tests/mysql-client-tests/.gitignore similarity index 100% rename from mysql-client-tests/.gitignore rename to integration-tests/mysql-client-tests/.gitignore diff --git a/mysql-client-tests/README.md b/integration-tests/mysql-client-tests/README.md similarity index 100% rename from mysql-client-tests/README.md rename to integration-tests/mysql-client-tests/README.md diff --git a/mysql-client-tests/c/Makefile b/integration-tests/mysql-client-tests/c/Makefile similarity index 100% rename from mysql-client-tests/c/Makefile rename to integration-tests/mysql-client-tests/c/Makefile diff --git a/mysql-client-tests/c/mysql-connector-c-test.c b/integration-tests/mysql-client-tests/c/mysql-connector-c-test.c similarity index 100% rename from mysql-client-tests/c/mysql-connector-c-test.c rename to integration-tests/mysql-client-tests/c/mysql-connector-c-test.c diff --git a/mysql-client-tests/cpp/CMakeLists.txt b/integration-tests/mysql-client-tests/cpp/CMakeLists.txt similarity index 100% rename from mysql-client-tests/cpp/CMakeLists.txt rename to integration-tests/mysql-client-tests/cpp/CMakeLists.txt diff --git a/mysql-client-tests/cpp/Makefile b/integration-tests/mysql-client-tests/cpp/Makefile similarity index 100% rename from mysql-client-tests/cpp/Makefile rename to integration-tests/mysql-client-tests/cpp/Makefile diff --git a/mysql-client-tests/cpp/README.md b/integration-tests/mysql-client-tests/cpp/README.md similarity index 100% rename from mysql-client-tests/cpp/README.md rename to integration-tests/mysql-client-tests/cpp/README.md diff --git a/mysql-client-tests/cpp/mysql-connector-cpp-test.cpp b/integration-tests/mysql-client-tests/cpp/mysql-connector-cpp-test.cpp similarity index 100% rename from mysql-client-tests/cpp/mysql-connector-cpp-test.cpp rename to integration-tests/mysql-client-tests/cpp/mysql-connector-cpp-test.cpp diff --git a/integration-tests/mysql-client-tests/cpp/third_party/mysql-connector-cpp b/integration-tests/mysql-client-tests/cpp/third_party/mysql-connector-cpp new file mode 160000 index 0000000000..857a8d63d8 --- /dev/null +++ b/integration-tests/mysql-client-tests/cpp/third_party/mysql-connector-cpp @@ -0,0 +1 @@ +Subproject commit 857a8d63d817a17160ca6062ceef6e9d6d0dd128 diff --git a/mysql-client-tests/dotnet/.gitignore b/integration-tests/mysql-client-tests/dotnet/.gitignore similarity index 100% rename from mysql-client-tests/dotnet/.gitignore rename to integration-tests/mysql-client-tests/dotnet/.gitignore diff --git a/mysql-client-tests/dotnet/MySqlClient/Program.cs b/integration-tests/mysql-client-tests/dotnet/MySqlClient/Program.cs similarity index 100% rename from mysql-client-tests/dotnet/MySqlClient/Program.cs rename to integration-tests/mysql-client-tests/dotnet/MySqlClient/Program.cs diff --git a/mysql-client-tests/dotnet/MySqlClient/dotnet.csproj b/integration-tests/mysql-client-tests/dotnet/MySqlClient/dotnet.csproj similarity index 100% rename from mysql-client-tests/dotnet/MySqlClient/dotnet.csproj rename to integration-tests/mysql-client-tests/dotnet/MySqlClient/dotnet.csproj diff --git a/mysql-client-tests/dotnet/MySqlClient/dotnet.sln b/integration-tests/mysql-client-tests/dotnet/MySqlClient/dotnet.sln similarity index 100% rename from mysql-client-tests/dotnet/MySqlClient/dotnet.sln rename to integration-tests/mysql-client-tests/dotnet/MySqlClient/dotnet.sln diff --git a/mysql-client-tests/dotnet/MySqlConnector/MySqlConnectorTest.csproj b/integration-tests/mysql-client-tests/dotnet/MySqlConnector/MySqlConnectorTest.csproj similarity index 100% rename from mysql-client-tests/dotnet/MySqlConnector/MySqlConnectorTest.csproj rename to integration-tests/mysql-client-tests/dotnet/MySqlConnector/MySqlConnectorTest.csproj diff --git a/mysql-client-tests/dotnet/MySqlConnector/MySqlConnectorTest.sln b/integration-tests/mysql-client-tests/dotnet/MySqlConnector/MySqlConnectorTest.sln similarity index 100% rename from mysql-client-tests/dotnet/MySqlConnector/MySqlConnectorTest.sln rename to integration-tests/mysql-client-tests/dotnet/MySqlConnector/MySqlConnectorTest.sln diff --git a/mysql-client-tests/dotnet/MySqlConnector/Program.cs b/integration-tests/mysql-client-tests/dotnet/MySqlConnector/Program.cs similarity index 100% rename from mysql-client-tests/dotnet/MySqlConnector/Program.cs rename to integration-tests/mysql-client-tests/dotnet/MySqlConnector/Program.cs diff --git a/mysql-client-tests/go/go-sql-driver-mysql-test.go b/integration-tests/mysql-client-tests/go/go-sql-driver-mysql-test.go similarity index 100% rename from mysql-client-tests/go/go-sql-driver-mysql-test.go rename to integration-tests/mysql-client-tests/go/go-sql-driver-mysql-test.go diff --git a/mysql-client-tests/java/MySQLConnectorTest.java b/integration-tests/mysql-client-tests/java/MySQLConnectorTest.java similarity index 100% rename from mysql-client-tests/java/MySQLConnectorTest.java rename to integration-tests/mysql-client-tests/java/MySQLConnectorTest.java diff --git a/integration-tests/mysql-client-tests/mysql-client-tests-entrypoint.sh b/integration-tests/mysql-client-tests/mysql-client-tests-entrypoint.sh new file mode 100755 index 0000000000..9ee3bc7e83 --- /dev/null +++ b/integration-tests/mysql-client-tests/mysql-client-tests-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +echo "Updating dolt config for tests:" +dolt config --global --add metrics.disabled true +dolt config --global --add metrics.host localhost +dolt config --global --add user.name mysql-test-runner +dolt config --global --add user.email mysql-test-runner@liquidata.co + +echo "Running mysql-client-tests:" +bats /mysql-client-tests/mysql-client-tests.bats diff --git a/mysql-client-tests/mysql-client-tests.bats b/integration-tests/mysql-client-tests/mysql-client-tests.bats similarity index 100% rename from mysql-client-tests/mysql-client-tests.bats rename to integration-tests/mysql-client-tests/mysql-client-tests.bats diff --git a/mysql-client-tests/node/index.js b/integration-tests/mysql-client-tests/node/index.js similarity index 100% rename from mysql-client-tests/node/index.js rename to integration-tests/mysql-client-tests/node/index.js diff --git a/mysql-client-tests/node/package-lock.json b/integration-tests/mysql-client-tests/node/package-lock.json similarity index 100% rename from mysql-client-tests/node/package-lock.json rename to integration-tests/mysql-client-tests/node/package-lock.json diff --git a/mysql-client-tests/node/package.json b/integration-tests/mysql-client-tests/node/package.json similarity index 100% rename from mysql-client-tests/node/package.json rename to integration-tests/mysql-client-tests/node/package.json diff --git a/mysql-client-tests/perl/dbd-mysql-test.pl b/integration-tests/mysql-client-tests/perl/dbd-mysql-test.pl similarity index 100% rename from mysql-client-tests/perl/dbd-mysql-test.pl rename to integration-tests/mysql-client-tests/perl/dbd-mysql-test.pl diff --git a/mysql-client-tests/python/mysql.connector-test.py b/integration-tests/mysql-client-tests/python/mysql.connector-test.py similarity index 100% rename from mysql-client-tests/python/mysql.connector-test.py rename to integration-tests/mysql-client-tests/python/mysql.connector-test.py diff --git a/mysql-client-tests/python/pymysql-test.py b/integration-tests/mysql-client-tests/python/pymysql-test.py similarity index 100% rename from mysql-client-tests/python/pymysql-test.py rename to integration-tests/mysql-client-tests/python/pymysql-test.py diff --git a/mysql-client-tests/python/sqlalchemy-test.py b/integration-tests/mysql-client-tests/python/sqlalchemy-test.py similarity index 100% rename from mysql-client-tests/python/sqlalchemy-test.py rename to integration-tests/mysql-client-tests/python/sqlalchemy-test.py diff --git a/mysql-client-tests/ruby/Gemfile b/integration-tests/mysql-client-tests/ruby/Gemfile similarity index 100% rename from mysql-client-tests/ruby/Gemfile rename to integration-tests/mysql-client-tests/ruby/Gemfile diff --git a/mysql-client-tests/ruby/Gemfile.lock b/integration-tests/mysql-client-tests/ruby/Gemfile.lock similarity index 100% rename from mysql-client-tests/ruby/Gemfile.lock rename to integration-tests/mysql-client-tests/ruby/Gemfile.lock diff --git a/mysql-client-tests/ruby/ruby-mysql-test.rb b/integration-tests/mysql-client-tests/ruby/ruby-mysql-test.rb similarity index 100% rename from mysql-client-tests/ruby/ruby-mysql-test.rb rename to integration-tests/mysql-client-tests/ruby/ruby-mysql-test.rb diff --git a/mysql-client-tests/cpp/third_party/mysql-connector-cpp b/mysql-client-tests/cpp/third_party/mysql-connector-cpp deleted file mode 160000 index 6b2fc10205..0000000000 --- a/mysql-client-tests/cpp/third_party/mysql-connector-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6b2fc1020534b908f90610f5ebdcf36a7df67cfd