all: disable any -race test that fails or times out

cmd/jujud/agent/machine_test.go

@@ -12,7 +12,6 @@ import (
 	"runtime"
 	"strings"
 	"sync/atomic"
-	"testing"
 	"time"
 
 	"github.com/juju/cmd"
@@ -95,12 +94,6 @@ var (
 	_ = gc.Suite(&mongoSuite{})
 )
 
-func TestPackage(t *testing.T) {
-	// TODO(waigani) 2014-03-19 bug 1294458
-	// Refactor to use base suites
-	coretesting.MgoTestPackage(t)
-}
-
 type commonMachineSuite struct {
 	singularRecord *singularRunnerRecord
 	lxctesting.TestSuite

cmd/jujud/agent/package_test.go

@@ -0,0 +1,21 @@
+// Copyright 2015 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package agent_test
+
+import (
+	stdtesting "testing"
+
+	"github.com/juju/testing"
+
+	coretesting "github.com/juju/juju/testing"
+)
+
+func TestPackage(t *stdtesting.T) {
+	if testing.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519133, 1519097")
+	}
+	// TODO(waigani) 2014-03-19 bug 1294458
+	// Refactor to use base suites
+	coretesting.MgoTestPackage(t)
+}

provider/ec2/suite_test.go → provider/ec2/package_test.go

@@ -5,14 +5,19 @@ package ec2_test
 
 import (
 	"flag"
-	"testing"
+	stdtesting "testing"
+
+	"github.com/juju/testing"
 
 	gc "gopkg.in/check.v1"
 )
 
 var amazon = flag.Bool("amazon", false, "Also run some tests on live Amazon servers")
 
-func TestEC2(t *testing.T) {
+func TestPackage(t *stdtesting.T) {
+	if testing.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519141")
+	}
 	if *amazon {
 		registerAmazonTests()
 	}

state/conn_test.go

@@ -4,22 +4,14 @@
 package state_test
 
 import (
-	stdtesting "testing"
-
 	"github.com/juju/names"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/mgo.v2"
 
 	"github.com/juju/juju/state"
 	statetesting "github.com/juju/juju/state/testing"
-	"github.com/juju/juju/testing"
 )
 
-// TestPackage integrates the tests into gotest.
-func TestPackage(t *stdtesting.T) {
-	testing.MgoTestPackage(t)
-}
-
 // ConnSuite provides the infrastructure for all other
 // test suites (StateSuite, CharmSuite, MachineSuite, etc).
 type ConnSuite struct {

state/package_test.go

@@ -0,0 +1,19 @@
+// Copyright 2015 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package state
+
+import (
+	stdtesting "testing"
+
+	"github.com/juju/testing"
+
+	coretesting "github.com/juju/juju/testing"
+)
+
+func TestPackage(t *stdtesting.T) {
+	if testing.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519095")
+	}
+	coretesting.MgoTestPackage(t)
+}

worker/envworkermanager/envworkermanager_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/names"
+	jujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 	"launchpad.net/tomb"
@@ -24,6 +25,10 @@ import (
 )
 
 func TestPackage(t *stdtesting.T) {
+	if jujutesting.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519144")
+	}
+
 	testing.MgoTestPackage(t)
 }
 

worker/machiner/machiner_test.go

@@ -27,6 +27,13 @@ import (
 	"github.com/juju/juju/worker/machiner"
 )
 
+func TestPackage(t *stdtesting.T) {
+	if gitjujutesting.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519145")
+	}
+	coretesting.MgoTestPackage(t)
+}
+
 type MachinerSuite struct {
 	coretesting.BaseSuite
 	accessor   *mockMachineAccessor
@@ -249,10 +256,6 @@ func (s *MachinerSuite) TestMachinerStorageAttached(c *gc.C) {
 // unless they fail.
 const worstCase = 5 * time.Second
 
-func TestPackage(t *stdtesting.T) {
-	coretesting.MgoTestPackage(t)
-}
-
 type MachinerStateSuite struct {
 	testing.JujuConnSuite
 

worker/provisioner/package_test.go

@@ -6,9 +6,14 @@ package provisioner_test
 import (
 	stdtesting "testing"
 
-	"github.com/juju/juju/testing"
+	"github.com/juju/testing"
+
+	coretesting "github.com/juju/juju/testing"
 )
 
-func Test(t *stdtesting.T) {
-	testing.MgoTestPackage(t)
+func TestPackage(t *stdtesting.T) {
+	if testing.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519097")
+	}
+	coretesting.MgoTestPackage(t)
 }

worker/rsyslog/rsyslog_common_test.go

@@ -26,6 +26,9 @@ import (
 )
 
 func TestPackage(t *stdtesting.T) {
+	if testing.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519147")
+	}
 	coretesting.MgoTestPackage(t)
 }
 

worker/uniter/package_test.go

@@ -6,9 +6,14 @@ package uniter_test
 import (
 	stdtesting "testing"
 
+	"github.com/juju/testing"
+
 	coretesting "github.com/juju/juju/testing"
 )
 
 func TestPackage(t *stdtesting.T) {
+	if testing.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519097")
+	}
 	coretesting.MgoTestPackage(t)
 }

worker/uniter/remotestate/package_test.go

@@ -4,11 +4,15 @@
 package remotestate_test
 
 import (
-	stdtesting "testing"
+	"testing"
 
+	jujutesting "github.com/juju/testing"
 	gc "gopkg.in/check.v1"
 )
 
-func TestPackage(t *stdtesting.T) {
+func TestPackage(t *testing.T) {
+	if jujutesting.RaceEnabled {
+		t.Skip("skipping package under -race, see LP 1519149")
+	}
 	gc.TestingT(t)
 }