Interface update, per-method Contexts.

service/datastore/meta/eg_test.go

Index: service/datastore/meta/eg_test.go
diff --git a/service/datastore/meta/eg_test.go b/service/datastore/meta/eg_test.go
index bc99a7607c224809d5300138bd6618fc80ed6c8b..bc8a6ab089a1b604789215d1545b0abe955f1fab 100644
--- a/service/datastore/meta/eg_test.go
+++ b/service/datastore/meta/eg_test.go
@@ -10,9 +10,11 @@ import (
 
 	"github.com/luci/gae/filter/featureBreaker"
 	"github.com/luci/gae/impl/memory"
-	"github.com/luci/gae/service/datastore"
-	. "github.com/smartystreets/goconvey/convey"
+	ds "github.com/luci/gae/service/datastore"
+
 	"golang.org/x/net/context"
+
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestGetEntityGroupVersion(t *testing.T) {
@@ -21,27 +23,26 @@ func TestGetEntityGroupVersion(t *testing.T) {
 	Convey("GetEntityGroupVersion", t, func() {
 		c := memory.Use(context.Background())
 		c, fb := featureBreaker.FilterRDS(c, errors.New("INTERNAL_ERROR"))
-		ds := datastore.Get(c)
 
-		pm := datastore.PropertyMap{
-			"$key": {datastore.MkPropertyNI(ds.MakeKey("A", ""))},
-			"Val":  {datastore.MkProperty(10)},
+		pm := ds.PropertyMap{
+			"$key": {ds.MkPropertyNI(ds.MakeKey(c, "A", ""))},
+			"Val":  {ds.MkProperty(10)},
 		}
-		So(ds.Put(pm), ShouldBeNil)
-		aKey := ds.KeyForObj(pm)
+		So(ds.Put(c, pm), ShouldBeNil)
+		aKey := ds.KeyForObj(c, pm)
 		So(aKey, ShouldNotBeNil)
 
 		v, err := GetEntityGroupVersion(c, aKey)
 		So(err, ShouldBeNil)
 		So(v, ShouldEqual, 1)
 
-		So(ds.Delete(aKey), ShouldBeNil)
+		So(ds.Delete(c, aKey), ShouldBeNil)
 
-		v, err = GetEntityGroupVersion(c, ds.NewKey("madeUp", "thing", 0, aKey))
+		v, err = GetEntityGroupVersion(c, ds.NewKey(c, "madeUp", "thing", 0, aKey))
 		So(err, ShouldBeNil)
 		So(v, ShouldEqual, 2)
 
-		v, err = GetEntityGroupVersion(c, ds.NewKey("madeUp", "thing", 0, nil))
+		v, err = GetEntityGroupVersion(c, ds.NewKey(c, "madeUp", "thing", 0, nil))
 		So(err, ShouldBeNil)
 		So(v, ShouldEqual, 0)