Fix miscellaneous prod bugs.

service/datastore/checkfilter_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 (
         "testing"
@@ skipping 50 matching lines @@
                         So(rds.GetMulti(nil, nil, nil), ShouldBeNil)
                         So(rds.GetMulti([]Key{mkKey("", "", "", "")}, nil, nil).Error(), ShouldContainSubstring, "is nil")
 
                         // this is in the wrong aid/ns
                         keys := []Key{mkKey("wut", "wrong", "Kind", 1)}
                         So(rds.GetMulti(keys, nil, func(pm PropertyMap, err error) {
                                 So(pm, ShouldBeNil)
                                 So(err, ShouldEqual, ErrInvalidKey)
                         }), ShouldBeNil)
 
-                        keys[0] = mkKey("aid", "ns", "Kind", 1)
+                        keys[0] = mkKey("s~aid", "ns", "Kind", 1)
                         hit := false
                         So(func() {
                                 rds.GetMulti(keys, nil, func(pm PropertyMap, err error) {
                                         hit = true
                                 })
                         }, ShouldPanic)
                         So(hit, ShouldBeFalse)
                 })
 
                 Convey("PutMulti", func() {
                         keys := []Key{}
                         vals := []PropertyMap{{}}
                         So(rds.PutMulti(keys, vals, nil).Error(),
                                 ShouldContainSubstring, "mismatched keys/vals")
                         So(rds.PutMulti(nil, nil, nil), ShouldBeNil)
 
                         badParent := mkKey("aid", "ns", "Wut", 0)
                         keys = append(keys, mkKey("aid", "ns", "Kind", 0, badParent))
                         So(rds.PutMulti(keys, vals, nil).Error(), ShouldContainSubstring, "callback is nil")
 
                         So(rds.PutMulti(keys, vals, func(k Key, err error) {
                                 So(k, ShouldBeNil)
                                 So(err, ShouldEqual, ErrInvalidKey)
                         }), ShouldBeNil)
 
-                        keys = []Key{mkKey("aid", "ns", "Kind", 0)}
+                        keys = []Key{mkKey("s~aid", "ns", "Kind", 0)}
                         vals = []PropertyMap{nil}
                         So(rds.PutMulti(keys, vals, func(k Key, err error) {
                                 So(k, ShouldBeNil)
                                 So(err.Error(), ShouldContainSubstring, "nil vals entry")
                         }), ShouldBeNil)
 
                         vals = []PropertyMap{{}}
                         hit := false
                         So(func() {
                                 rds.PutMulti(keys, vals, func(k Key, err error) {
                                         hit = true
                                 })
                         }, ShouldPanic)
                         So(hit, ShouldBeFalse)
                 })
 
                 Convey("DeleteMulti", func() {
                         So(rds.DeleteMulti(nil, nil), ShouldBeNil)
                         So(rds.DeleteMulti([]Key{mkKey("", "", "", "")}, nil).Error(), ShouldContainSubstring, "is nil")
                         So(rds.DeleteMulti([]Key{mkKey("", "", "", "")}, func(err error) {
                                 So(err, ShouldEqual, ErrInvalidKey)
                         }), ShouldBeNil)
 
                         hit := false
                         So(func() {
-                                rds.DeleteMulti([]Key{mkKey("aid", "ns", "Kind", 1)}, func(error) {
+                                rds.DeleteMulti([]Key{mkKey("s~aid", "ns", "Kind", 1)}, func(error) {
                                         hit = true
                                 })
                         }, ShouldPanic)
                         So(hit, ShouldBeFalse)
                 })
 
         })
 }