Merge pull request juju#6190 from howbazaar/retry-dummy-reset

Another attempt to catch the unexpected message. mgo.Dial was only one place we found unexpected messages. Resetting the dummy provider also occasionally fails. (Review request: http://reviews.vapour.ws/r/5626/)
sinanawad · Sep 8, 2016 · d3e3c71 · d3e3c71
2 parents 3066c25 + f79e051
commit d3e3c71
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/provider/dummy/environs.go b/provider/dummy/environs.go
@@ -30,10 +30,12 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
+	"github.com/juju/retry"
 	"github.com/juju/schema"
 	gitjujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/arch"
+	"github.com/juju/utils/clock"
 	"github.com/juju/utils/series"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/environschema.v1"
@@ -310,7 +312,17 @@ func Reset(c *gc.C) {
 		s.destroy()
 	}
 	if mongoAlive() {
-		err := gitjujutesting.MgoServer.Reset()
+		err := retry.Call(retry.CallArgs{
+			Func: gitjujutesting.MgoServer.Reset,
+			// Only interested in retrying the intermittent
+			// 'unexpected message'.
+			IsFatalError: func(err error) bool {
+				return !strings.HasSuffix(err.Error(), "unexpected message")
+			},
+			Delay:    time.Millisecond,
+			Clock:    clock.WallClock,
+			Attempts: 5,
+		})
 		c.Assert(err, jc.ErrorIsNil)
 	}
 }