Skip to content

Commit 4e411a1

Browse files
authored
refactor: recover unit and integration tests (#10)
* refactor: update unit and integration tests * refactor: update tests: turn off -mod=vendor in cmd tests * refactor: update tests: fix tests on windows
1 parent b95b6ee commit 4e411a1

File tree

160 files changed

+524
-742
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+524
-742
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
_build
1010

1111
# models
12-
models/
12+
/models/
1313

1414
# tmp test data
1515
test_data/tmp*

Makefile

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,44 @@ GO_FILES:=$$(find ./ -type f -name '*.go' -not -path ".//vendor/*")
55
build-local-all: build-darwin build-darwin-arm64 build-linux build-windows
66

77
build-local:
8-
chmod +x ${PROJECT_ROOT}/scripts/build.sh
9-
PROJECT_ROOT=${PROJECT_ROOT} ${PROJECT_ROOT}/scripts/build.sh
8+
rm -rf ${PROJECT_ROOT}/_build/bin
9+
mkdir -p ${PROJECT_ROOT}/_build/bin
10+
go build -o ${PROJECT_ROOT}/_build/bin/kcl-openapi ${PROJECT_ROOT}
1011

1112
build-darwin:
1213
rm -rf ${PROJECT_ROOT}/_build/bin/darwin
1314
mkdir -p ${PROJECT_ROOT}/_build/bin/darwin
14-
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -mod=vendor -o ${PROJECT_ROOT}/_build/bin/darwin/kclopenapi ${PROJECT_ROOT}
15+
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ${PROJECT_ROOT}/_build/bin/darwin/kcl-openapi ${PROJECT_ROOT}
1516

1617
build-darwin-arm64:
1718
rm -rf ${PROJECT_ROOT}/_build/bin/darwin-arm64
1819
mkdir -p ${PROJECT_ROOT}/_build/bin/darwin-arm64
19-
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -mod=vendor -o ${PROJECT_ROOT}/_build/bin/darwin-arm64/kclopenapi ${PROJECT_ROOT}
20+
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o ${PROJECT_ROOT}/_build/bin/darwin-arm64/kcl-openapi ${PROJECT_ROOT}
2021

2122
build-linux:
2223
rm -rf ${PROJECT_ROOT}/_build/bin/linux
2324
mkdir -p ${PROJECT_ROOT}/_build/bin/linux
24-
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=vendor -o ${PROJECT_ROOT}/_build/bin/linux/kclopenapi ${PROJECT_ROOT}
25+
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ${PROJECT_ROOT}/_build/bin/linux/kcl-openapi ${PROJECT_ROOT}
2526

2627
build-windows:
2728
rm -rf ${PROJECT_ROOT}/_build/bin/windows
2829
mkdir -p ${PROJECT_ROOT}/_build/bin/windows
29-
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -mod=vendor -o ${PROJECT_ROOT}/_build/bin/windows/kclopenapi ${PROJECT_ROOT}
30+
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ${PROJECT_ROOT}/_build/bin/windows/kcl-openapi.exe ${PROJECT_ROOT}
3031

31-
test: unit-test integration-test
32+
test:
33+
cd ${PROJECT_ROOT}/pkg
34+
go test ./...
3235

33-
unit-test:
34-
chmod +x ${PROJECT_ROOT}/scripts/unit_test.sh
35-
PROJECT_ROOT=${PROJECT_ROOT} ${PROJECT_ROOT}/scripts/unit_test.sh
36-
37-
integration-test:
38-
@echo "1. build binary ..."
39-
@make build-local
40-
@echo "2. run integration test ..."
41-
chmod +x ${PROJECT_ROOT}/scripts/integration_test.sh
42-
PROJECT_ROOT=${PROJECT_ROOT} ${PROJECT_ROOT}/scripts/integration_test.sh
43-
44-
test-local:
36+
vet-fmt:
4537
go vet ./...
4638
go fmt ./...
47-
@echo "test"
48-
@make unit-test
49-
@make integration-test
5039

5140
clean:
5241
rm -rf models
5342
rm -rf test_data/tmp_*
5443

5544
check-fmt:
56-
test -z $$(goimports -l -w -e -local=kusionstack.io/kcl-openapi $(GO_FILES))
45+
test -z $$(goimports -l -w -e -local=kusionstack.io $(GO_FILES))
5746

5847
regenerate:
5948
go run scripts/regenerate.go

_test/integration/gen_model_test.go

Lines changed: 0 additions & 49 deletions
This file was deleted.

_test/integration/initegrate_gen.go

Lines changed: 0 additions & 188 deletions
This file was deleted.

_test/kube_resource/integrate/single_model/models/kusion_kubernetes/apimachinery/apis/managed_fields_entry.k

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)