Add integration test to code coverage metrics (#1010)

Go 1.10 removes the need to run each test separately with the -coverprofile flag. * Include integration tests in coverage * Remove parallel from travis build script. * codecovio automatically merges coverage profiles
google · Jul 6, 2018 · 6c6f87bf51dcb8ec1c67b42cee4435884c9477cb · 6c6f87b
1 parent aa51994
commit 6c6f87bf51dcb8ec1c67b42cee4435884c9477cb
Unified Split

Showing with 4 additions and 10 deletions.

+1 −0 .gitignore

+2 −3 .travis.yml

+1 −1 Makefile

+0 −6 coverage.sh
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ genfiles/*
 travis_secrets.tar.gz
 service_key.json
 client_secret*.json
+coverage.txt
diff --git a/.travis.yml b/.travis.yml
@@ -17,18 +17,17 @@ addons:
  apt:
    packages:
    - python3-pip
-    - parallel

 install:
  - go get -u github.com/alecthomas/gometalinter
  - gometalinter --install 
  - go get -t ./...

 script:
-  - export TRILLIAN_SQL_DRIVER=mysql
  - make
  - gometalinter --config=gometalinter.json ./...
-  - ./coverage.sh
+  - go test ./... -coverprofile=coverage1.txt
+  - TRILLIAN_SQL_DRIVER=mysql go test ./impl/integration/ -coverprofile=coverage2.txt -coverpkg=./...

 after_success:
  - bash <(curl -s https://codecov.io/bash)
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ test: main
 	TRILLIAN_SQL_DRIVER=mysql go test ./...

 coverage: main
-	TRILLIAN_SQL_DRIVER=mysql go test ./... -cover 
+	TRILLIAN_SQL_DRIVER=mysql go test ./... -cover

 check:
 	gometalinter --config=gometalinter.json ./...
diff --git a/coverage.sh b/coverage.sh