From 7f31ec33981fb9c2a5659ed24090ec84217dba54 Mon Sep 17 00:00:00 2001 From: Silas Davis Date: Fri, 16 Sep 2016 17:08:31 +0200 Subject: [PATCH 1/3] Fix doc comment on mempool reap --- mempool/mempool.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mempool/mempool.go b/mempool/mempool.go index 34df870f8..acc52ae6e 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -239,7 +239,7 @@ func (mem *Mempool) resCbRecheck(req *tmsp.Request, res *tmsp.Response) { } // Get the valid transactions remaining -// If maxTxs is 0, there is no cap. +// If maxTxs is -1, there is no cap on returned transactions. func (mem *Mempool) Reap(maxTxs int) []types.Tx { mem.proxyMtx.Lock() defer mem.proxyMtx.Unlock() From a1649f774ec4af61cce8ce1d1e80100a73a55b43 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Sun, 25 Sep 2016 18:02:54 +0900 Subject: [PATCH 2/3] test: codecov --- circle.yml | 4 +++- test/run_test.sh | 3 +-- test/test.sh | 5 ++++- test/test_cover.sh | 13 +++++++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 test/test_cover.sh diff --git a/circle.yml b/circle.yml index de49c473c..decf14f9e 100644 --- a/circle.yml +++ b/circle.yml @@ -31,4 +31,6 @@ test: override: - "cd $REPO && make test_integrations" post: - - bash <(curl -s https://codecov.io/bash) + - "cd $REPO && bash <(curl -s https://codecov.io/bash)" + + diff --git a/test/run_test.sh b/test/run_test.sh index 90e8f5026..9ef4388f2 100644 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -6,8 +6,7 @@ echo `pwd` BRANCH=`git rev-parse --abbrev-ref HEAD` echo "Current branch: $BRANCH" -# go test --race github.com/tendermint/tendermint/... -make test_race +bash test/test_cover.sh # run the app tests bash test/app/test.sh diff --git a/test/test.sh b/test/test.sh index 6e2925902..dc50501e2 100644 --- a/test/test.sh +++ b/test/test.sh @@ -10,7 +10,10 @@ bash ./test/docker/build.sh echo "" echo "* running go tests and app tests in docker container" -docker run -t tester bash test/run_test.sh +docker run --name run_test -t tester bash test/run_test.sh + +# copy the coverage results out of docker container +docker cp run_test:/go/src/github.com/tendermint/tendermint/coverage.txt . # test basic network connectivity # by starting a local testnet and checking peers connect and make blocks diff --git a/test/test_cover.sh b/test/test_cover.sh new file mode 100644 index 000000000..52d45dc53 --- /dev/null +++ b/test/test_cover.sh @@ -0,0 +1,13 @@ +#! /bin/bash + +PKGS=$(go list github.com/tendermint/tendermint/... | grep -v /vendor/) + +set -e +echo "mode: atomic" > coverage.txt +for pkg in ${PKGS[@]}; do + go test -race -coverprofile=profile.out -covermode=atomic $pkg + if [ -f profile.out ]; then + tail -n +2 profile.out >> coverage.txt; + rm profile.out + fi +done From c481d2bcbbf112377eb314ff5eb4f2d6ce35d11a Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Sun, 25 Sep 2016 23:32:28 +0900 Subject: [PATCH 3/3] README shields --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9819b3626..807b9531c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,17 @@ # Tendermint Simple, Secure, Scalable Blockchain Platform -[![CircleCI](https://circleci.com/gh/tendermint/tendermint.svg?style=svg)](https://circleci.com/gh/tendermint/tendermint) -[![codecov](https://codecov.io/gh/tendermint/tendermint/branch/develop/graph/badge.svg)](https://codecov.io/gh/tendermint/tendermint) +[![version](https://img.shields.io/github/tag/tendermint/tendermint.svg)](https://github.com/tendermint/tendermint/releases/latest) +[![API Reference]( +https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 +)](https://godoc.org/github.com/tendermint/tendermint) +[![chat](https://img.shields.io/badge/slack-join%20chat-pink.svg)](http://forum.tendermint.com:3000/) +[![license](https://img.shields.io/github/license/tendermint/tendermint.svg)](https://github.com/tendermint/tendermint/blob/master/LICENSE) + +Branch | Tests | Coverage | Report Card +----------|-------|----------|------------- +develop | [![CircleCI](https://circleci.com/gh/tendermint/tendermint/tree/develop.svg?style=shield)](https://circleci.com/gh/tendermint/tendermint/tree/develop) | [![codecov](https://codecov.io/gh/tendermint/tendermint/branch/develop/graph/badge.svg)](https://codecov.io/gh/tendermint/tendermint) | [![Go Report Card](https://goreportcard.com/badge/github.com/tendermint/tendermint/tree/develop)](https://goreportcard.com/report/github.com/tendermint/tendermint/tree/develop) +master | [![CircleCI](https://circleci.com/gh/tendermint/tendermint/tree/master.svg?style=shield)](https://circleci.com/gh/tendermint/tendermint/tree/master) | [![codecov](https://codecov.io/gh/tendermint/tendermint/branch/master/graph/badge.svg)](https://codecov.io/gh/tendermint/tendermint) | [![Go Report Card](https://goreportcard.com/badge/github.com/tendermint/tendermint/tree/master)](https://goreportcard.com/report/github.com/tendermint/tendermint/tree/master) _NOTE: This is yet pre-alpha non-production-quality software._