Merge pull request #133 from axw/testing-mgo-default-storageengine

testing: default to mmapv1 only on x86(_64)

When building mongod, mmapv1 is only enabled by
default for x86 and x86_64. Change the tests to
use wiredTiger on other architectures.

Author: jujubot

mgo.go

@@ -64,12 +64,6 @@ const (
 
 	// The default password to use when connecting to the mongo database.
 	DefaultMongoPassword = "conn-from-name-secret"
-
-	// defaultMongoStorageEngine is the default storage engine to use
-	// in Mongo 3.2 onwards for tests. We default to mmapv1 (vs. the
-	// mongo default of wiredTiger) for the best performance in tests,
-	// but make it configurable.
-	defaultMongoStorageEngine = "mmapv1"
 )
 
 // Certs holds the certificates and keys required to make a secure
@@ -267,11 +261,10 @@ func (inst *MgoInstance) run() error {
 		mgoargs = append(mgoargs, "--nojournal")
 	}
 	if version.Compare(storageEngineMongoVersion) >= 0 {
-		storageEngine := os.Getenv("JUJU_MONGO_STORAGE_ENGINE")
-		if storageEngine == "" {
-			storageEngine = defaultMongoStorageEngine
+		storageEngine := mongoStorageEngine()
+		if storageEngine != "" {
+			mgoargs = append(mgoargs, "--storageEngine", storageEngine)
 		}
-		mgoargs = append(mgoargs, "--storageEngine", storageEngine)
 	}
 
 	if inst.Params != nil {
@@ -339,6 +332,21 @@ func (inst *MgoInstance) run() error {
 	return nil
 }
 
+func mongoStorageEngine() string {
+	storageEngine := os.Getenv("JUJU_MONGO_STORAGE_ENGINE")
+	if storageEngine != "" {
+		return storageEngine
+	}
+	switch runtime.GOARCH {
+	case "386", "amd64":
+		// On x86(_64), mmapv1 should always be available. If not
+		// overridden via the environment variable above, we use
+		// mmapv1 by default for the best performance in tests.
+		return "mmapv1"
+	}
+	return "" // use the default
+}
+
 // mongodCache looks up mongod path and version and caches the result.
 type mongodCache struct {
 	sync.Mutex