Add server/cache support to gaeconfig.

tokenserver/appengine/delegation/rpc_import_delegation_configs_test.go

 // Copyright 2016 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 delegation
 
 import (
         "testing"
 
         "golang.org/x/net/context"
 
         "github.com/luci/gae/service/info"
         "github.com/luci/luci-go/appengine/gaetesting"
         "github.com/luci/luci-go/common/clock/testclock"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/config/impl/memory"
+        "github.com/luci/luci-go/luci_config/server/cfgclient/backend/testconfig"
         admin "github.com/luci/luci-go/tokenserver/api/admin/v1"
 
         . "github.com/luci/luci-go/common/testing/assertions"
         . "github.com/smartystreets/goconvey/convey"
 )
 
 func TestImportDelegationConfigs(t *testing.T) {
         Convey("Works", t, func() {
                 ctx := gaetesting.TestingContext()
                 ctx, _ = testclock.UseTime(ctx, testclock.TestTimeUTC)
@@ skipping 32 matching lines @@
                 So(cfg.Revision, ShouldEqual, "780529c8f5e6b219e27482978d792d580f7d4f9d")
 
                 // Noop import.
                 resp, err = rpc.ImportDelegationConfigs(ctx, nil)
                 So(err, ShouldBeNil)
                 So(resp.ImportedConfigs[0].Revision, ShouldEqual, "780529c8f5e6b219e27482978d792d580f7d4f9d")
 
                 // Try to import completely broken config.
                 ctx = prepareCfg(ctx, `I'm broken`)
                 _, err = rpc.ImportDelegationConfigs(ctx, nil)
-                So(err, ShouldErrLike, `can't parse config file - line 1.0: unknown field name`)
+                So(err, ShouldErrLike, `line 1.0: unknown field name`)
 
                 // Old config is not replaced.
                 cfg, _ = FetchDelegationConfig(ctx)
                 So(cfg.Revision, ShouldEqual, "780529c8f5e6b219e27482978d792d580f7d4f9d")
 
                 // Try to import a config that doesn't pass validation.
                 ctx = prepareCfg(ctx, `rules {
                         name: "rule 1"
                 }`)
                 _, err = rpc.ImportDelegationConfigs(ctx, nil)
                 So(err, ShouldErrLike, `validation error - rule #1 ("rule 1"): 'requestor' is required (and 4 other errors)`)
 
                 // Old config is not replaced.
                 cfg, _ = FetchDelegationConfig(ctx)
                 So(cfg.Revision, ShouldEqual, "780529c8f5e6b219e27482978d792d580f7d4f9d")
         })
 }
 
 func prepareCfg(c context.Context, configFile string) context.Context {
-        return config.SetImplementation(c, memory.New(map[string]memory.ConfigSet{
+        return testconfig.WithCommonClient(c, memory.New(map[string]memory.ConfigSet{
                 "services/" + info.AppID(c): {
                         "delegation.cfg": configFile,
                 },
         }))
 }