Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Report coverage correctly #644

Merged
merged 4 commits into from
Nov 10, 2015
Merged

Report coverage correctly #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c71797
Run coverage reporting in post test stage, as teardown is run after t…
tomwilkie Nov 10, 2015
c0f3a59
Squashed 'tools/' changes from 28c6aa0..1fc4d66
tomwilkie Nov 10, 2015
40135dc
Merge commit 'c0f3a59726ecb6842632fee77c6a28858f617270' into coverage
tomwilkie Nov 10, 2015
8d13077
Update to deal with weave/499d6312b7e6159ab94c116127b9c020fe109118
tomwilkie Nov 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion integration/310_container_to_container_edge_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions integration/320_container_edge_cross_host_2_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view


scope_on $HOST1 launch
scope_on $HOST2 launch
Expand Down
7 changes: 1 addition & 6 deletions tools/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion tools/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down