Fix miscellaneous prod bugs.

service/datastore/datastore_test.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // adapted from github.com/golang/appengine/datastore
 
 package datastore
 
 import (
         "fmt"
         "testing"
 
         "github.com/luci/gae/service/info"
         "github.com/luci/luci-go/common/errors"
         . "github.com/smartystreets/goconvey/convey"
         "golang.org/x/net/context"
 )
 
 func fakeDatastoreFactory(c context.Context) RawInterface {
         i := info.Get(c)
         return &fakeDatastore{
-                aid: i.AppID(),
+                aid: i.FullyQualifiedAppID(),
                 ns:  i.GetNamespace(),
         }
 }
 
 type fakeQuery struct {
         Query
 
         limit int
 
         err          error
@@ skipping 512 matching lines @@
 
         Convey("Test Delete/DeleteMulti", t, func() {
                 c := info.Set(context.Background(), fakeInfo{})
                 c = SetRawFactory(c, fakeDatastoreFactory)
                 ds := Get(c)
                 So(ds, ShouldNotBeNil)
 
                 Convey("bad", func() {
                         Convey("get single error for RPC failure", func() {
                                 keys := []Key{
-                                        mkKey("aid", "ns", "FailAll", 1, nil),
-                                        mkKey("aid", "ns", "Ok", 1, nil),
+                                        mkKey("s~aid", "ns", "FailAll", 1, nil),
+                                        mkKey("s~aid", "ns", "Ok", 1, nil),
                                 }
                                 So(ds.DeleteMulti(keys).Error(), ShouldEqual, "DeleteMulti fail all")
                         })
 
                         Convey("get multi error for individual failure", func() {
                                 keys := []Key{
                                         ds.NewKey("Ok", "", 1, nil),
                                         ds.NewKey("Fail", "", 2, nil),
                                 }
                                 So(ds.DeleteMulti(keys).Error(), ShouldEqual, "DeleteMulti fail")
@@ skipping 327 matching lines @@
                                 So(ds.Run(q, func(k Key, _ CursorCB) bool {
                                         So(k.IntID(), ShouldEqual, i+1)
                                         i++
                                         return true
                                 }), ShouldBeNil)
                         })
 
                 })
         })
 }