move e2e tests to test package

Remove test/* files from coverage
aerospike · Dec 7, 2023 · 93db6b2 · 93db6b2
1 parent 575bd5d
commit 93db6b2
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 244 deletions.
diff --git a/Makefile b/Makefile
@@ -27,10 +27,10 @@ test: mocks
 	go test -v ./...
 
 .PHONY: coverage
-coverage: 
-	go test ./... -coverprofile coverage.cov -coverpkg ./...
-	grep -v "_mock.go" coverage.cov > coverage_no_mocks.cov
-	mv coverage_no_mocks.cov coverage.cov
+coverage: mocks
+	go test ./... -coverprofile coverage.cov -coverpkg ./... || true
+	grep -v "_mock.go" coverage.cov > coverage_no_mocks.cov && mv coverage_no_mocks.cov coverage.cov
+	grep -v "test/" coverage.cov > coverage_no_mocks.cov && mv coverage_no_mocks.cov coverage.cov
 	go tool cover -func coverage.cov
 
 .PHONY: clean-mocks

diff --git a/asconfig/generate.go b/asconfig/generate.go
@@ -33,14 +33,14 @@ type ConfGetter interface {
 }
 
 type GenConf struct {
-	conf    Conf
-	version string
+	Conf    Conf
+	Version string
 }
 
 func newGenConf(conf Conf, version string) *GenConf {
 	return &GenConf{
-		conf:    conf,
-		version: version,
+		Conf:    conf,
+		Version: version,
 	}
 }