Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Fix Coverage report (#142)

Guilherme Oenning51884048a8f1
diff --git a/.gitignore b/.gitignore
index c3383caf1..dc1fcf302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ tmp/
dist/
output/
node_modules/
-*.coverprofile
.vscode/
fider
@@ -14,10 +13,9 @@ gin-bin.exe~
.env
npm-debug.log
-coverage.txt
profile.out
debug
debug.test
.DS_Store
-.cover
-cover.out
\ No newline at end of file
+cover.out
+coverage.tmp
diff --git a/Makefile b/Makefile
index dec6e44ed..72b2a06da 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,9 @@ test:
godotenv -f ${ENV_FILE} go test ./... -cover -p=1
coverage:
- godotenv -f ${ENV_FILE} ./cover.sh $$(go list ./... | grep -v /vendor/)
+ echo 'mode: atomic' > cover.out
+ go list ./... | xargs -n1 -I{} sh -c 'godotenv -f ${ENV_FILE} go test -covermode=atomic -coverpkg=./... -coverprofile=coverage.tmp {} && tail -n +2 coverage.tmp >> cover.out'
+ rm coverage.tmp
build:
go build -a -ldflags='-X main.buildtime=${BUILD_TIME}' -o fider .
diff --git a/cover.sh b/cover.sh
deleted file mode 100755
index 2df771a2d..000000000
--- a/cover.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-set -e
-
-COVER=.cover
-ROOT_PKG=github.com/getfider/fider/
-
-if [[ -d "$COVER" ]]; then
- rm -rf "$COVER"
-fi
-mkdir -p "$COVER"
-
-i=0
-for pkg in "$@"; do
- i=$((i + 1))
-
- extracoverpkg=""
- if [[ -f "$GOPATH/src/$pkg/.extra-coverpkg" ]]; then
- extracoverpkg=$( \
- sed -e "s|^|$pkg/|g" < "$GOPATH/src/$pkg/.extra-coverpkg" \
- | tr '\n' ',')
- fi
-
- coverpkg=$(go list -json "$pkg" | jq -r '
- .Deps
- | . + ["'"$pkg"'"]
- | map
- ( select(startswith("'"$ROOT_PKG"'"))
- | select(contains("/vendor/") | not)
- )
- | join(",")
- ')
- testcoverpkg=$(go list -json "$pkg" | jq -r '
- .XTestImports
- | . + ["'"$pkg"'"]
- | map
- ( select(startswith("'"$ROOT_PKG"'"))
- | select(contains("/vendor/") | not)
- )
- | join(",")
- ')
- if [[ -n "$extracoverpkg" ]]; then
- coverpkg="$extracoverpkg$coverpkg"
- fi
-
- args=""
- if [[ -n "$coverpkg" ]]; then
- args="-p=1 -coverprofile $COVER/cover.${i}.out -covermode=atomic -coverpkg $coverpkg,$testcoverpkg"
- fi
-
- echo go test $args -v -race "$pkg"
- go test $args -v -race "$pkg"
-done
-
-gocovmerge "$COVER"/*.out > cover.out
\ No newline at end of file
diff --git a/wercker.yml b/wercker.yml
index 94b898b18..1d76379b5 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -6,7 +6,7 @@ services:
POSTGRES_PASSWORD: fider_test-pw
build-assets:
- box: node:8.1
+ box: node:8.6
steps:
- npm-install
@@ -28,7 +28,7 @@ test:
steps:
# Get dependencies
- script:
- name: get dotenv
+ name: get dependencies
code: |
go get github.com/joho/godotenv/cmd/godotenv
@@ -48,18 +48,11 @@ coverage:
box: golang:1.9
base-path: /go/src/github.com/getfider/fider
steps:
- # Install jq
- - script:
- name: install jq
- code: |
- curl -L http://stedolan.github.io/jq/download/linux64/jq -o /usr/local/bin/jq
- chmod +x /usr/local/bin/jq
# Get dependencies
- script:
name: get dependencies
code: |
go get github.com/joho/godotenv/cmd/godotenv
- go get github.com/wadey/gocovmerge
# Publish to codecov.io
- script: