Interface update, per-method Contexts.

service/datastore/meta/eg_test.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package meta
 
 import (
         "errors"
         "testing"
 
         "github.com/luci/gae/filter/featureBreaker"
         "github.com/luci/gae/impl/memory"
-        "github.com/luci/gae/service/datastore"
+        ds "github.com/luci/gae/service/datastore"
+
+        "golang.org/x/net/context"
+
         . "github.com/smartystreets/goconvey/convey"
-        "golang.org/x/net/context"
 )
 
 func TestGetEntityGroupVersion(t *testing.T) {
         t.Parallel()
 
         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)
 
                 fb.BreakFeatures(nil, "GetMulti")
 
                 v, err = GetEntityGroupVersion(c, aKey)
                 So(err.Error(), ShouldContainSubstring, "INTERNAL_ERROR")
         })
 }