Merge lp:~cmars/juju-core/cs-mongo-tests into lp:~go-bot/juju-core/trunk

[Casey Marshall]

Disable charm store tests that require Mongo JS.

Juju CI tests run against a build of MongoDB that does not support javascript
for cross-platform reasons. This causes some of the charm store tests to fail
which use map reduce to test the stats collection. Made the execution of these
tests configurable with a -mongojs suite flag, off by default.

https://codereview.appspot.com/82930043/

Disable charm store tests that require Mongo JS.

Juju CI tests run against a build of MongoDB that does not support javascript
for cross-platform reasons. This causes some of the charm store tests to fail
which use map reduce to test the stats collection. Made the execution of these
tests configurable with a -mongojs suite flag, off by default.

https://codereview.appspot.com/82930043/

[Casey Marshall (cmars)]

Reviewers: mp+213563_code.launchpad.net,

Message:
Please take a look.

Description:
Disable charm store tests that require Mongo JS.

Juju CI tests run against a build of MongoDB that does not support
javascript
for cross-platform reasons. This causes some of the charm store tests to
fail
which use map reduce to test the stats collection. Made the execution of
these
tests configurable with a -mongojs suite flag, off by default.

https://code.launchpad.net/~cmars/juju-core/cs-mongo-tests/+merge/213563

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/82930043/

Affected files (+33, -0 lines):
   A [revision details]
   M store/server_test.go
   M store/store_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140331232430-drvjtzkduheba0pm
+New revision: <email address hidden>

Index: store/server_test.go
=== modified file 'store/server_test.go'
--- store/server_test.go 2014-03-27 05:00:05 +0000
+++ store/server_test.go 2014-04-01 00:11:10 +0000
@@ -203,6 +203,10 @@
  // checkCounterSum checks that statistics are properly collected.
  // It retries a few times as they are generally collected in background.
  func (s *StoreSuite) checkCounterSum(c *gc.C, key []string, prefix bool,
expected int64) {
+ if !*mongojs {
+ c.Skip("MongoDB javascript not available")
+ }
+
   var sum int64
   for retry := 0; retry < 10; retry++ {
    time.Sleep(1e8)

Index: store/store_test.go
=== modified file 'store/store_test.go'
--- store/store_test.go 2014-03-27 05:00:05 +0000
+++ store/store_test.go 2014-04-01 00:11:10 +0000
@@ -4,6 +4,7 @@
  package store_test

  import (
+ "flag"
   "fmt"
   "io"
   "io/ioutil"
@@ -35,6 +36,8 @@
   store *store.Store
  }

+var mongojs *bool = flag.Bool("mongojs", false, "MongoDB in test
environment supports javascript")
+
  type TrivialSuite struct{}

  func (s *StoreSuite) SetUpSuite(c *gc.C) {
@@ -601,6 +604,10 @@
  }

  func (s *StoreSuite) TestSumCounters(c *gc.C) {
+ if !*mongojs {
+ c.Skip("MongoDB javascript not available")
+ }
+
   req := store.CounterRequest{Key: []string{"a"}}
   cs, err := s.store.Counters(&req)
   c.Assert(err, gc.IsNil)
@@ -674,6 +681,10 @@
  }

  func (s *StoreSuite) TestCountersReadOnlySum(c *gc.C) {
+ if !*mongojs {
+ c.Skip("MongoDB javascript not available")
+ }
+
   // Summing up an unknown key shouldn't add the key to the database.
   req := store.CounterRequest{Key: []string{"a", "b", "c"}}
   _, err := s.store.Counters(&req)
@@ -686,6 +697,10 @@
  }

  func (s *StoreSuite) TestCountersTokenCaching(c *gc.C) {
+ if !*mongojs {
+ c.Skip("MongoDB javascript not available")
+ }
+
   assertSum := func(i int, want int64) {
    req := store.CounterRequest{Key: []string{strconv.Itoa(i)}}
    cs, err := s.store.Counters(&req)
@@ -741,6 +756,10 @@
  }

  func (s *StoreSuite) TestCounterTokenUniqueness(c *gc.C) {
+ if !*mongojs {
+ c.Skip("MongoDB javascript not available")
+ }
+
   var wg0, wg1 sync.WaitGroup
   wg0.Add(10)
   wg1.Add(10)
@@ -762,6 +781,...

[Casey Marshall (cmars)]

Fix LP: #1295140

https://codereview.appspot.com/82930043/

[Dave Cheney (dave-cheney)]

lgtm, you can use `lbox propose -bug=1295140` to link this branch to the bug

[William Reade (fwereade)]

https://codereview.appspot.com/82930043/diff/1/store/store_test.go
File store/store_test.go (right):

https://codereview.appspot.com/82930043/diff/1/store/store_test.go#newcode39
store/store_test.go:39: var mongojs *bool = flag.Bool("mongojs", false,
"MongoDB in test environment supports javascript")
LGTM *so long as* we have a path for running CI tests with mongojs
somewhere. Please coordinate with curtis.

https://codereview.appspot.com/82930043/

[Go Bot (go-bot)]

The attempt to merge lp:~cmars/juju-core/cs-mongo-tests into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 1.113s
ok launchpad.net/juju-core/agent/mongo 0.275s
ok launchpad.net/juju-core/agent/tools 0.217s
ok launchpad.net/juju-core/bzr 4.963s
ok launchpad.net/juju-core/cert 2.709s
ok launchpad.net/juju-core/charm 0.494s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.030s
ok launchpad.net/juju-core/cloudinit/sshinit 0.747s
ok launchpad.net/juju-core/cmd 0.154s
ok launchpad.net/juju-core/cmd/charm-admin 0.746s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.198s
ok launchpad.net/juju-core/cmd/juju 210.542s

----------------------------------------------------------------------
PANIC: agent.go:0: MachineSuite.SetUpTest

[LOG] 11.67958 DEBUG juju.environs.configstore Making /tmp/jctest.8Pq/gocheck-8674665223082153551/73/home/ubuntu/.juju/environments
[LOG] 11.74973 INFO juju environs/testing: uploading FAKE tools 1.19.0-precise-amd64
[LOG] 11.75033 INFO juju environs/testing: uploading FAKE tools 1.19.0-precise-amd64
[LOG] 11.76160 INFO juju environs/testing: uploading FAKE tools 1.19.0-precise-amd64
[LOG] 11.76231 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 11.76232 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 11.76239 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 11.76242 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 11.76244 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 11.76250 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.json": invalid URL "tools/streams/v1/index.json" not found
[LOG] 11.76286 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 11.76291 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 11.76304 DEBUG juju.environs.bootstrap environment "dummyenv" supports service/machine networks: true
[LOG] 11.76305 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 11.76308 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.19.0
[LOG] 11.76309 INFO juju.environs.tools reading tools with major.minor version 1.19
[LOG] 11.76314 INFO juju.environs.tools filtering tools by version: 1.19.0
[LOG] 11.76315 INFO juju.environs.tools filtering tools by series: precise
[LOG] 11.76316 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 11.76322 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.s...

[John A Meinel (jameinel)]

Note that we can't easily pass flags on the bot, but the *bot* is perfectly happy to run these tests, because it is running precise with the full mongodb version.

[John A Meinel (jameinel)]

We could probably change the Tarmac landing bot to do:

go test ./... && (cd store && go test -mongojs=true) && ...

Would that work for you?

[Casey Marshall (cmars)]

Please take a look.

https://codereview.appspot.com/82930043/

[Casey Marshall (cmars)]

Updated per jam's suggestions:
- invert the logic, mongojs tests are on by default unless you opt-out
- support env var JUJU_NOTEST_MONGODB=1 to disable mongojs tests

https://codereview.appspot.com/82930043/

[Casey Marshall (cmars)]

On 2014/04/10 16:23:57, cmars wrote:
> Updated per jam's suggestions:
> - invert the logic, mongojs tests are on by default unless you opt-out
> - support env var JUJU_NOTEST_MONGODB=1 to disable mongojs tests

Correction: it's JUJU_NOTEST_MONGOJS=1

https://codereview.appspot.com/82930043/

[John A Meinel (jameinel)]

LGTM.

I slightly prefer the positive form:
JUJU_TEST_MONGOJS=disable
or something like that, but I still think this is better than not having
it.

https://codereview.appspot.com/82930043/

=== modified file 'CONTRIBUTING'
--- CONTRIBUTING	2014-03-07 12:02:41 +0000
+++ CONTRIBUTING	2014-04-10 18:06:27 +0000
@@ -132,6 +132,19 @@
 
     go test launchpad.net/juju-core
 
+MongoDB
+-------
+
+Many tests use a standalone instance of mongod as part of their setup. The
+`mongod` binary found in $PATH is executed by these suites.
+
+Some tests (particularly those under ./store/...) assume a MongoDB instance
+that supports Javascript for map-reduce functions. These functions are not
+supported by juju-mongodb and the associated tests will fail unless disabled
+with an environment variable:
+
+    JUJU_NOTEST_MONGOJS=1 go test launchpad.net/juju-core/...
+
 Proposing
 =========
 

=== modified file 'store/server_test.go'
--- store/server_test.go	2014-03-27 05:00:05 +0000
+++ store/server_test.go	2014-04-10 18:06:27 +0000
@@ -203,6 +203,10 @@
 // checkCounterSum checks that statistics are properly collected.
 // It retries a few times as they are generally collected in background.
 func (s *StoreSuite) checkCounterSum(c *gc.C, key []string, prefix bool, expected int64) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	var sum int64
 	for retry := 0; retry < 10; retry++ {
 		time.Sleep(1e8)
@@ -298,6 +302,10 @@
 }
 
 func (s *StoreSuite) TestStatsCounter(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	for _, key := range [][]string{{"a", "b"}, {"a", "b"}, {"a", "c"}, {"a"}} {
 		err := s.store.IncCounter(key)
 		c.Assert(err, gc.IsNil)
@@ -328,6 +336,10 @@
 }
 
 func (s *StoreSuite) TestStatsCounterList(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	incs := [][]string{
 		{"a"},
 		{"a", "b"},
@@ -376,6 +388,10 @@
 }
 
 func (s *StoreSuite) TestStatsCounterBy(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	incs := []struct {
 		key []string
 		day int

=== modified file 'store/store_test.go'
--- store/store_test.go	2014-03-27 05:00:05 +0000
+++ store/store_test.go	2014-04-10 18:06:27 +0000
@@ -4,9 +4,11 @@
 package store_test
 
 import (
+	"flag"
 	"fmt"
 	"io"
 	"io/ioutil"
+	"os"
 	"strconv"
 	"sync"
 	stdtesting "testing"
@@ -35,12 +37,19 @@
 	store *store.Store
 }
 
+var noTestMongoJs *bool = flag.Bool("notest-mongojs", false, "Disable MongoDB tests that require javascript")
+
 type TrivialSuite struct{}
 
 func (s *StoreSuite) SetUpSuite(c *gc.C) {
 	s.MgoSuite.SetUpSuite(c)
 	s.HTTPSuite.SetUpSuite(c)
 	s.LoggingSuite.SetUpSuite(c)
+
+	if os.Getenv("JUJU_NOTEST_MONGOJS") == "1" {
+		c.Log("Tests requiring MongoDB Javascript will be skipped")
+		*noTestMongoJs = true
+	}
 }
 
 func (s *StoreSuite) TearDownSuite(c *gc.C) {
@@ -601,6 +610,10 @@
 }
 
 func (s *StoreSuite) TestSumCounters(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	req := store.CounterRequest{Key: []string{"a"}}
 	cs, err := s.store.Counters(&req)
 	c.Assert(err, gc.IsNil)
@@ -674,6 +687,10 @@
 }
 
 func (s *StoreSuite) TestCountersReadOnlySum(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	// Summing up an unknown key shouldn't add the key to the database.
 	req := store.CounterRequest{Key: []string{"a", "b", "c"}}
 	_, err := s.store.Counters(&req)
@@ -686,6 +703,10 @@
 }
 
 func (s *StoreSuite) TestCountersTokenCaching(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	assertSum := func(i int, want int64) {
 		req := store.CounterRequest{Key: []string{strconv.Itoa(i)}}
 		cs, err := s.store.Counters(&req)
@@ -741,6 +762,10 @@
 }
 
 func (s *StoreSuite) TestCounterTokenUniqueness(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	var wg0, wg1 sync.WaitGroup
 	wg0.Add(10)
 	wg1.Add(10)
@@ -762,6 +787,10 @@
 }
 
 func (s *StoreSuite) TestListCounters(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	incs := [][]string{
 		{"c", "b", "a"}, // Assign internal id c < id b < id a, to make sorting slightly trickier.
 		{"a"},
@@ -823,6 +852,10 @@
 }
 
 func (s *StoreSuite) TestListCountersBy(c *gc.C) {
+	if *noTestMongoJs {
+		c.Skip("MongoDB javascript not available")
+	}
+
 	incs := []struct {
 		key []string
 		day int