Interface update, per-method Contexts.

filter/featureBreaker/featurebreaker_test.go

Index: filter/featureBreaker/featurebreaker_test.go
diff --git a/filter/featureBreaker/featurebreaker_test.go b/filter/featureBreaker/featurebreaker_test.go
index 09be8ff8b946ddd5834a637f7b492ededfd7428b..a552c7b9c6532e87c3743670a858fefa8b2fb0f7 100644
--- a/filter/featureBreaker/featurebreaker_test.go
+++ b/filter/featureBreaker/featurebreaker_test.go
@@ -8,10 +8,12 @@ import (
 	"testing"
 
 	"github.com/luci/gae/impl/memory"
-	"github.com/luci/gae/service/datastore"
+	ds "github.com/luci/gae/service/datastore"
 	"github.com/luci/luci-go/common/errors"
-	. "github.com/smartystreets/goconvey/convey"
+
 	"golang.org/x/net/context"
+
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestBrokenFeatures(t *testing.T) {
@@ -25,41 +27,39 @@ func TestBrokenFeatures(t *testing.T) {
 		Convey("Can break ds", func() {
 			Convey("without a default", func() {
 				c, bf := FilterRDS(c, nil)
-				ds := datastore.Get(c)
-				vals := []datastore.PropertyMap{{
-					"$key": {datastore.MkPropertyNI(ds.NewKey("Wut", "", 1, nil))},
+				vals := []ds.PropertyMap{{
+					"$key": {ds.MkPropertyNI(ds.NewKey(c, "Wut", "", 1, nil))},
 				}}
 
 				Convey("by specifying an error", func() {
 					bf.BreakFeatures(e, "GetMulti", "PutMulti")
-					So(ds.GetMulti(vals), ShouldEqual, e)
+					So(ds.Get(c, vals), ShouldEqual, e)
 
 					Convey("and you can unbreak them as well", func() {
 						bf.UnbreakFeatures("GetMulti")
 
-						So(errors.SingleError(ds.GetMulti(vals)), ShouldEqual, datastore.ErrNoSuchEntity)
+						So(errors.SingleError(ds.Get(c, vals)), ShouldEqual, ds.ErrNoSuchEntity)
 
 						Convey("no broken features at all is a shortcut", func() {
 							bf.UnbreakFeatures("PutMulti")
-							So(errors.SingleError(ds.GetMulti(vals)), ShouldEqual, datastore.ErrNoSuchEntity)
+							So(errors.SingleError(ds.Get(c, vals)), ShouldEqual, ds.ErrNoSuchEntity)
 						})
 					})
 				})
 
 				Convey("Not specifying an error gets you a generic error", func() {
 					bf.BreakFeatures(nil, "GetMulti")
-					So(ds.GetMulti(vals).Error(), ShouldContainSubstring, `feature "GetMulti" is broken`)
+					So(ds.Get(c, vals).Error(), ShouldContainSubstring, `feature "GetMulti" is broken`)
 				})
 			})
 
 			Convey("with a default", func() {
 				c, bf := FilterRDS(c, e)
-				ds := datastore.Get(c)
-				vals := []datastore.PropertyMap{{
-					"$key": {datastore.MkPropertyNI(ds.NewKey("Wut", "", 1, nil))},
+				vals := []ds.PropertyMap{{
+					"$key": {ds.MkPropertyNI(ds.NewKey(c, "Wut", "", 1, nil))},
 				}}
 				bf.BreakFeatures(nil, "GetMulti")
-				So(ds.GetMulti(vals), ShouldEqual, e)
+				So(ds.Get(c, vals), ShouldEqual, e)
 			})
 		})
 	})