Fix test make target and import paths

uber · Jul 13, 2020 · ab48f8a · ab48f8a
1 parent 9668b8e
commit ab48f8a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -159,7 +159,9 @@ test-only:
 	@PATH=$(PATH):$(GOIMPORTS) ZANZIBAR_CACHE=1 go test -race ./codegen/... ./runtime/... | grep -v '\[no test files\]'
 	@PATH=$(PATH):$(GOIMPORTS) ZANZIBAR_CACHE=1 go test -race $$(go list ./examples/example-gateway/... | grep -v build) | \
 	 grep -v '\[no test files\]'
-	@PATH=$(PATH):$(GOIMPORTS) ZANZIBAR_CACHE=1 go test ./test/... ./examples/example-gateway/build/... | \
+	@PATH=$(PATH):$(GOIMPORTS) ZANZIBAR_CACHE=1 go test -race $$(go list ./examples/selective-gateway/... | grep -v build) | \
+	 grep -v '\[no test files\]'
+	@PATH=$(PATH):$(GOIMPORTS) ZANZIBAR_CACHE=1 go test ./test/... ./examples/example-gateway/build/... ./examples/selective-gateway/build/... | \
 	 grep -v '\[no test files\]'
 	@rm -f ./test/.cached_binary_test_info.json
 	@echo "<coverage />" > ./coverage/cobertura-coverage.xml

diff --git a/codegen/runner/pre-steps.sh b/codegen/runner/pre-steps.sh
@@ -229,7 +229,7 @@ $(find "${target_dirs[@]}" -name "*.go" | \
 )
 "$EASY_JSON_BINARY" -all -- "${thriftrw_gofiles[@]}"
 
-goimports -w "$BUILD_DIR/gen-code/"
+goimports -w "$ABS_GENCODE_DIR" "$ABS_PROTO_GENCODE_DIR"
 
 end=$(date +%s)
 runtime=$((end - start))

diff --git a/examples/selective-gateway/endpoints/bounce/bounce.go b/examples/selective-gateway/endpoints/bounce/bounce.go
@@ -27,9 +27,9 @@ import (
 	mirrorclient "github.com/uber/zanzibar/examples/selective-gateway/build/clients/mirror"
 	"github.com/uber/zanzibar/examples/selective-gateway/build/endpoints/bounce/module"
 	"github.com/uber/zanzibar/examples/selective-gateway/build/endpoints/bounce/workflow"
-	"github.com/uber/zanzibar/examples/selective-gateway/build/gen-code/clients/echo"
-	"github.com/uber/zanzibar/examples/selective-gateway/build/gen-code/clients/mirror"
 	"github.com/uber/zanzibar/examples/selective-gateway/build/gen-code/endpoints/bounce/bounce"
+	"github.com/uber/zanzibar/examples/selective-gateway/build/proto-gen/clients/echo"
+	"github.com/uber/zanzibar/examples/selective-gateway/build/proto-gen/clients/mirror"
 	zanzibar "github.com/uber/zanzibar/runtime"
 )
 

diff --git a/examples/selective-gateway/endpoints/bounce/bounce_test.go b/examples/selective-gateway/endpoints/bounce/bounce_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/uber/zanzibar/examples/selective-gateway/build/gen-code/clients/echo"
-	"github.com/uber/zanzibar/examples/selective-gateway/build/gen-code/clients/mirror"
 	"github.com/uber/zanzibar/examples/selective-gateway/build/gen-code/endpoints/bounce/bounce"
+	"github.com/uber/zanzibar/examples/selective-gateway/build/proto-gen/clients/echo"
+	"github.com/uber/zanzibar/examples/selective-gateway/build/proto-gen/clients/mirror"
 )
 
 func TestEcho(t *testing.T) {