diff --git a/Dockerfile.integration b/Dockerfile.integration index 58446197..193019a0 100644 --- a/Dockerfile.integration +++ b/Dockerfile.integration @@ -10,7 +10,7 @@ COPY --from=consul /bin/consul /bin/consul RUN apk add --no-cache make tzdata WORKDIR /go/src/github.com/hairyhenderson/gomplate/ -COPY tests/integration ./tests/integration +COPY internal/tests/integration ./internal/tests/integration COPY Makefile ./Makefile COPY bin/gomplate_linux-amd64 ./bin/gomplate diff --git a/Makefile b/Makefile index 721b8034..608a5b03 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ endif integration: build $(GO) test -v -tags=integration \ - ./tests/integration + ./internal/tests/integration integration.iid: Dockerfile.integration $(PREFIX)/bin/$(PKG_NAME)_linux-amd64$(call extension,$(GOOS)) docker build -f $< --iidfile $@ . @@ -212,7 +212,7 @@ lint: --enable unparam \ --enable unused \ --enable varcheck \ - ./tests/integration + ./internal/tests/integration .PHONY: gen-changelog clean test build-x compress-all build-release build test-integration-docker gen-docs lint clean-images clean-containers docker-images .DELETE_ON_ERROR: diff --git a/tests/integration/base64_test.go b/internal/tests/integration/base64_test.go similarity index 100% rename from tests/integration/base64_test.go rename to internal/tests/integration/base64_test.go diff --git a/tests/integration/basic_nonwindows_test.go b/internal/tests/integration/basic_nonwindows_test.go similarity index 100% rename from tests/integration/basic_nonwindows_test.go rename to internal/tests/integration/basic_nonwindows_test.go diff --git a/tests/integration/basic_test.go b/internal/tests/integration/basic_test.go similarity index 100% rename from tests/integration/basic_test.go rename to internal/tests/integration/basic_test.go diff --git a/tests/integration/collection_test.go b/internal/tests/integration/collection_test.go similarity index 100% rename from tests/integration/collection_test.go rename to internal/tests/integration/collection_test.go diff --git a/tests/integration/config_test.go b/internal/tests/integration/config_test.go similarity index 100% rename from tests/integration/config_test.go rename to internal/tests/integration/config_test.go diff --git a/tests/integration/datasources_blob_test.go b/internal/tests/integration/datasources_blob_test.go similarity index 100% rename from tests/integration/datasources_blob_test.go rename to internal/tests/integration/datasources_blob_test.go diff --git a/tests/integration/datasources_boltdb_test.go b/internal/tests/integration/datasources_boltdb_test.go similarity index 100% rename from tests/integration/datasources_boltdb_test.go rename to internal/tests/integration/datasources_boltdb_test.go diff --git a/tests/integration/datasources_consul_test.go b/internal/tests/integration/datasources_consul_test.go similarity index 100% rename from tests/integration/datasources_consul_test.go rename to internal/tests/integration/datasources_consul_test.go diff --git a/tests/integration/datasources_env_test.go b/internal/tests/integration/datasources_env_test.go similarity index 100% rename from tests/integration/datasources_env_test.go rename to internal/tests/integration/datasources_env_test.go diff --git a/tests/integration/datasources_file_test.go b/internal/tests/integration/datasources_file_test.go similarity index 100% rename from tests/integration/datasources_file_test.go rename to internal/tests/integration/datasources_file_test.go diff --git a/tests/integration/datasources_git_test.go b/internal/tests/integration/datasources_git_test.go similarity index 100% rename from tests/integration/datasources_git_test.go rename to internal/tests/integration/datasources_git_test.go diff --git a/tests/integration/datasources_http_test.go b/internal/tests/integration/datasources_http_test.go similarity index 100% rename from tests/integration/datasources_http_test.go rename to internal/tests/integration/datasources_http_test.go diff --git a/tests/integration/datasources_merge_test.go b/internal/tests/integration/datasources_merge_test.go similarity index 100% rename from tests/integration/datasources_merge_test.go rename to internal/tests/integration/datasources_merge_test.go diff --git a/tests/integration/datasources_vault_ec2_test.go b/internal/tests/integration/datasources_vault_ec2_test.go similarity index 100% rename from tests/integration/datasources_vault_ec2_test.go rename to internal/tests/integration/datasources_vault_ec2_test.go diff --git a/tests/integration/datasources_vault_test.go b/internal/tests/integration/datasources_vault_test.go similarity index 100% rename from tests/integration/datasources_vault_test.go rename to internal/tests/integration/datasources_vault_test.go diff --git a/tests/integration/docs_examples_test.go b/internal/tests/integration/docs_examples_test.go similarity index 100% rename from tests/integration/docs_examples_test.go rename to internal/tests/integration/docs_examples_test.go diff --git a/tests/integration/envvars_test.go b/internal/tests/integration/envvars_test.go similarity index 100% rename from tests/integration/envvars_test.go rename to internal/tests/integration/envvars_test.go diff --git a/tests/integration/file_test.go b/internal/tests/integration/file_test.go similarity index 100% rename from tests/integration/file_test.go rename to internal/tests/integration/file_test.go diff --git a/tests/integration/gomplateignore_test.go b/internal/tests/integration/gomplateignore_test.go similarity index 100% rename from tests/integration/gomplateignore_test.go rename to internal/tests/integration/gomplateignore_test.go diff --git a/tests/integration/inputdir_test.go b/internal/tests/integration/inputdir_test.go similarity index 100% rename from tests/integration/inputdir_test.go rename to internal/tests/integration/inputdir_test.go diff --git a/tests/integration/integration.go b/internal/tests/integration/integration.go similarity index 100% rename from tests/integration/integration.go rename to internal/tests/integration/integration.go diff --git a/tests/integration/integration_test.go b/internal/tests/integration/integration_test.go similarity index 100% rename from tests/integration/integration_test.go rename to internal/tests/integration/integration_test.go diff --git a/tests/integration/math_test.go b/internal/tests/integration/math_test.go similarity index 100% rename from tests/integration/math_test.go rename to internal/tests/integration/math_test.go diff --git a/tests/integration/nested_templates_test.go b/internal/tests/integration/nested_templates_test.go similarity index 100% rename from tests/integration/nested_templates_test.go rename to internal/tests/integration/nested_templates_test.go diff --git a/tests/integration/net_test.go b/internal/tests/integration/net_test.go similarity index 100% rename from tests/integration/net_test.go rename to internal/tests/integration/net_test.go diff --git a/tests/integration/plugins_test.go b/internal/tests/integration/plugins_test.go similarity index 100% rename from tests/integration/plugins_test.go rename to internal/tests/integration/plugins_test.go diff --git a/tests/integration/plugins_windows_test.go b/internal/tests/integration/plugins_windows_test.go similarity index 100% rename from tests/integration/plugins_windows_test.go rename to internal/tests/integration/plugins_windows_test.go diff --git a/tests/integration/regexp_test.go b/internal/tests/integration/regexp_test.go similarity index 100% rename from tests/integration/regexp_test.go rename to internal/tests/integration/regexp_test.go diff --git a/tests/integration/sockaddr_test.go b/internal/tests/integration/sockaddr_test.go similarity index 100% rename from tests/integration/sockaddr_test.go rename to internal/tests/integration/sockaddr_test.go diff --git a/tests/integration/strings_test.go b/internal/tests/integration/strings_test.go similarity index 100% rename from tests/integration/strings_test.go rename to internal/tests/integration/strings_test.go diff --git a/tests/integration/test_ec2_utils.go b/internal/tests/integration/test_ec2_utils.go similarity index 100% rename from tests/integration/test_ec2_utils.go rename to internal/tests/integration/test_ec2_utils.go diff --git a/tests/integration/test_test.go b/internal/tests/integration/test_test.go similarity index 100% rename from tests/integration/test_test.go rename to internal/tests/integration/test_test.go diff --git a/tests/integration/time_test.go b/internal/tests/integration/time_test.go similarity index 100% rename from tests/integration/time_test.go rename to internal/tests/integration/time_test.go diff --git a/tests/integration/tmpl_test.go b/internal/tests/integration/tmpl_test.go similarity index 100% rename from tests/integration/tmpl_test.go rename to internal/tests/integration/tmpl_test.go diff --git a/tests/integration/typeconv_test.go b/internal/tests/integration/typeconv_test.go similarity index 100% rename from tests/integration/typeconv_test.go rename to internal/tests/integration/typeconv_test.go