Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

New controller tests - deletion resources #2596

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ contrib/examples/consumer/Gopkg.lock
contrib/examples/consumer
contrib/examples/vendor/*
integration.test*
controller.test*
debug.test*
.cache
/api_violations.txt
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,15 @@ test-update-goldenfiles: .init

build-integration: .generate_files
$(DOCKER_CMD) go test -race github.com/kubernetes-sigs/service-catalog/test/integration/... -c
$(DOCKER_CMD) go test --tags="integration" -race github.com/kubernetes-sigs/service-catalog/pkg/controller/... -c
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we probably don't need to do this anymore. go caching should have improved everything enough that this doesn't save any time.

Need to ensure DOCKER_CMD mounts the cache dir, and we can drop the build ahead of running the tests part.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I totally agree with you but maybe let's do that as the follow-up and remove the building from all the test stages (build-integration and build-e2e).


test-integration: .init $(scBuildImageTarget) build build-integration
# test kubectl
contrib/hack/setup-kubectl.sh
contrib/hack/test-apiserver.sh
# golang integration tests
# # golang integration tests
$(DOCKER_CMD) ./integration.test -test.v $(INT_TEST_FLAGS)
$(DOCKER_CMD) ./controller.test

clean-e2e: .init $(scBuildImageTarget)
$(DOCKER_CMD) rm -f $(BINDIR)/e2e.test
Expand Down
Loading