Skip to content

Commit

Permalink
revert unit test update
Browse files Browse the repository at this point in the history
since supporting mage pieces have not been backported yet
  • Loading branch information
graphaelli committed Aug 23, 2018
1 parent 539610d commit 45904a7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
13 changes: 0 additions & 13 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package main

import (
"context"
"fmt"
"time"

Expand Down Expand Up @@ -104,18 +103,6 @@ func Fields() error {
return mage.GenerateFieldsYAML("model")
}

// Use RACE_DETECTOR=true to enable the race detector.
func GoTestUnit(ctx context.Context) error {
return mage.GoTest(ctx, mage.DefaultGoTestUnitArgs())
}

// GoTestIntegration executes the Go integration tests.
// Use TEST_COVERAGE=true to enable code coverage profiling.
// Use RACE_DETECTOR=true to enable the race detector.
func GoTestIntegration(ctx context.Context) error {
return mage.GoTest(ctx, mage.DefaultGoTestIntegrationArgs())
}

// -----------------------------------------------------------------------------
// Customizations specific to apm-server.
// - readme.md.tmpl used in packages is customized.
Expand Down
3 changes: 2 additions & 1 deletion script/jenkins/ci.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ echo "Building $env:beat"
exec { mage build } "Build FAILURE"

echo "Unit testing $env:beat"
exec { mage goTestUnit }
go test -v $(go list ./... | select-string -Pattern "vendor" -NotMatch) 2>&1 | Out-File -encoding UTF8 build/TEST-go-unit.out
exec { Get-Content build/TEST-go-unit.out | go-junit-report.exe -set-exit-code | Out-File -encoding UTF8 build/TEST-go-unit.xml } "Unit test FAILURE"

echo "System testing $env:beat"
# Get a CSV list of package names.
Expand Down

0 comments on commit 45904a7

Please sign in to comment.