Merge pull request #838 from hairyhenderson/move-integration-tests

Move integration tests to internal package
CSVD · May 9, 2020 · 7c0cd7f · 7c0cd7f
2 parents 9aa804c + 4823bdc
commit 7c0cd7f
Show file tree

Hide file tree

Showing 37 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 → internal/tests/integration/base64_test.go b/tests/integration/base64_test.go → internal/tests/integration/base64_test.go
diff --git a/tests/integration/basic_nonwindows_test.go → ...ests/integration/basic_nonwindows_test.go b/tests/integration/basic_nonwindows_test.go → ...ests/integration/basic_nonwindows_test.go
diff --git a/tests/integration/basic_test.go → internal/tests/integration/basic_test.go b/tests/integration/basic_test.go → internal/tests/integration/basic_test.go
diff --git a/tests/integration/collection_test.go → ...rnal/tests/integration/collection_test.go b/tests/integration/collection_test.go → ...rnal/tests/integration/collection_test.go
diff --git a/tests/integration/config_test.go → internal/tests/integration/config_test.go b/tests/integration/config_test.go → internal/tests/integration/config_test.go
diff --git a/tests/integration/datasources_blob_test.go → ...ests/integration/datasources_blob_test.go b/tests/integration/datasources_blob_test.go → ...ests/integration/datasources_blob_test.go
diff --git a/tests/integration/datasources_boltdb_test.go → ...ts/integration/datasources_boltdb_test.go b/tests/integration/datasources_boltdb_test.go → ...ts/integration/datasources_boltdb_test.go
diff --git a/tests/integration/datasources_consul_test.go → ...ts/integration/datasources_consul_test.go b/tests/integration/datasources_consul_test.go → ...ts/integration/datasources_consul_test.go
diff --git a/tests/integration/datasources_env_test.go → ...tests/integration/datasources_env_test.go b/tests/integration/datasources_env_test.go → ...tests/integration/datasources_env_test.go
diff --git a/tests/integration/datasources_file_test.go → ...ests/integration/datasources_file_test.go b/tests/integration/datasources_file_test.go → ...ests/integration/datasources_file_test.go
diff --git a/tests/integration/datasources_git_test.go → ...tests/integration/datasources_git_test.go b/tests/integration/datasources_git_test.go → ...tests/integration/datasources_git_test.go
diff --git a/tests/integration/datasources_http_test.go → ...ests/integration/datasources_http_test.go b/tests/integration/datasources_http_test.go → ...ests/integration/datasources_http_test.go
diff --git a/tests/integration/datasources_merge_test.go → ...sts/integration/datasources_merge_test.go b/tests/integration/datasources_merge_test.go → ...sts/integration/datasources_merge_test.go
diff --git a/...integration/datasources_vault_ec2_test.go → ...integration/datasources_vault_ec2_test.go b/...integration/datasources_vault_ec2_test.go → ...integration/datasources_vault_ec2_test.go
diff --git a/tests/integration/datasources_vault_test.go → ...sts/integration/datasources_vault_test.go b/tests/integration/datasources_vault_test.go → ...sts/integration/datasources_vault_test.go
diff --git a/tests/integration/docs_examples_test.go → ...l/tests/integration/docs_examples_test.go b/tests/integration/docs_examples_test.go → ...l/tests/integration/docs_examples_test.go
diff --git a/tests/integration/envvars_test.go → internal/tests/integration/envvars_test.go b/tests/integration/envvars_test.go → internal/tests/integration/envvars_test.go
diff --git a/tests/integration/file_test.go → internal/tests/integration/file_test.go b/tests/integration/file_test.go → internal/tests/integration/file_test.go
diff --git a/tests/integration/gomplateignore_test.go → .../tests/integration/gomplateignore_test.go b/tests/integration/gomplateignore_test.go → .../tests/integration/gomplateignore_test.go
diff --git a/tests/integration/inputdir_test.go → internal/tests/integration/inputdir_test.go b/tests/integration/inputdir_test.go → internal/tests/integration/inputdir_test.go
diff --git a/tests/integration/integration.go → internal/tests/integration/integration.go b/tests/integration/integration.go → internal/tests/integration/integration.go
diff --git a/tests/integration/integration_test.go → ...nal/tests/integration/integration_test.go b/tests/integration/integration_test.go → ...nal/tests/integration/integration_test.go
diff --git a/tests/integration/math_test.go → internal/tests/integration/math_test.go b/tests/integration/math_test.go → internal/tests/integration/math_test.go
diff --git a/tests/integration/nested_templates_test.go → ...ests/integration/nested_templates_test.go b/tests/integration/nested_templates_test.go → ...ests/integration/nested_templates_test.go
diff --git a/tests/integration/net_test.go → internal/tests/integration/net_test.go b/tests/integration/net_test.go → internal/tests/integration/net_test.go
diff --git a/tests/integration/plugins_test.go → internal/tests/integration/plugins_test.go b/tests/integration/plugins_test.go → internal/tests/integration/plugins_test.go
diff --git a/tests/integration/plugins_windows_test.go → ...tests/integration/plugins_windows_test.go b/tests/integration/plugins_windows_test.go → ...tests/integration/plugins_windows_test.go
diff --git a/tests/integration/regexp_test.go → internal/tests/integration/regexp_test.go b/tests/integration/regexp_test.go → internal/tests/integration/regexp_test.go
diff --git a/tests/integration/sockaddr_test.go → internal/tests/integration/sockaddr_test.go b/tests/integration/sockaddr_test.go → internal/tests/integration/sockaddr_test.go
diff --git a/tests/integration/strings_test.go → internal/tests/integration/strings_test.go b/tests/integration/strings_test.go → internal/tests/integration/strings_test.go
diff --git a/tests/integration/test_ec2_utils.go → internal/tests/integration/test_ec2_utils.go b/tests/integration/test_ec2_utils.go → internal/tests/integration/test_ec2_utils.go
diff --git a/tests/integration/test_test.go → internal/tests/integration/test_test.go b/tests/integration/test_test.go → internal/tests/integration/test_test.go
diff --git a/tests/integration/time_test.go → internal/tests/integration/time_test.go b/tests/integration/time_test.go → internal/tests/integration/time_test.go
diff --git a/tests/integration/tmpl_test.go → internal/tests/integration/tmpl_test.go b/tests/integration/tmpl_test.go → internal/tests/integration/tmpl_test.go
diff --git a/tests/integration/typeconv_test.go → internal/tests/integration/typeconv_test.go b/tests/integration/typeconv_test.go → internal/tests/integration/typeconv_test.go