github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #644 from weaveworks/coverage

Browse Source 
Report coverage correctly
This commit is contained in:
Tom Wilkie
2015-11-10 13:45:24 +00:00
parent 2dcc085dc8 8d1307764f
commit f274c5080a
5 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
circle.yml
View File

@@ -60,9 +60,6 @@ test:
post:
- test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh destroy):
parallel: true
teardown:
pre:
- test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; ./tools/cover/gather_coverage.sh ./coverage $SRCDIR/coverage):
parallel: true
- test "$CIRCLE_NODE_INDEX" != "0" || (goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/profile.cov -service=circleci || true):

2
integration/310_container_to_container_edge_test.sh
View File

@@ -4,7 +4,7 @@
start_suite "Test short lived connections between containers"
WEAVE_NO_FASTDP=true weave_on $HOST1 launch
WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch
scope_on $HOST1 launch
weave_on $HOST1 run -d --name nginx nginx
weave_on $HOST1 run -d --name client alpine /bin/sh -c "while true; do \

4
integration/320_container_edge_cross_host_2_test.sh
View File

@@ -4,8 +4,8 @@
start_suite "Test short lived connections between containers on different hosts"
WEAVE_NO_FASTDP=true weave_on $HOST1 launch $HOST1 $HOST2
WEAVE_NO_FASTDP=true weave_on $HOST2 launch $HOST1 $HOST2
WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch $HOST1 $HOST2
WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST2 launch $HOST1 $HOST2
scope_on $HOST1 launch
scope_on $HOST2 launch

7
tools/runner/runner.go
View File

@@ -138,16 +138,11 @@ func updateScheduler(test string, duration float64) {
func getSchedule(tests []string) ([]string, error) {
var (
prefix = os.Getenv("SCHEDULER_PREFIX")
buildNum = os.Getenv("CIRCLE_BUILD_NUM")
testRun = "integration-" + os.Getenv("CIRCLE_BUILD_NUM")
shardCount = os.Getenv("CIRCLE_NODE_TOTAL")
shardID = os.Getenv("CIRCLE_NODE_INDEX")
requestBody = &bytes.Buffer{}
testRun = "integration-" + buildNum
)
if prefix != "" {
testRun = prefix + "-" + buildNum
}
if err := json.NewEncoder(requestBody).Encode(schedule{tests}); err != nil {
return []string{}, err
}

2
tools/test
View File

@@ -63,7 +63,7 @@ for dir in $TESTDIRS; do
GO_TEST_ARGS_RUN="$GO_TEST_ARGS"
if [ -n "$SLOW" ]; then
COVERPKGS=$( (go list $dir; go list -f '{{join .Deps "\n"}}' $dir | grep -v "vendor" | grep "^$PACKAGE_BASE/") | paste -s -d,)
COVERPKGS=$( (go list $dir; go list -f '{{join .Deps "\n"}}' $dir | grep -v "vendor" | grep "^$PACKAGE_BASE/") | paste -s -d, -)
output=$(mktemp $coverdir/unit.XXXXXXXXXX)
GO_TEST_ARGS_RUN="$GO_TEST_ARGS -coverprofile=$output -coverpkg=$COVERPKGS"
fi