Differentiate between single- and multi- props.

filter/dscache/dscache_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 dscache
 
 import (
         "bytes"
         "encoding/binary"
         "errors"
@@ skipping 74 matching lines @@
 
                 Convey("enabled cases", func() {
                         c = FilterRDS(c, shardsForKey)
                         ds := datastore.Get(c)
                         So(dsUnder, ShouldNotBeNil)
                         So(ds, ShouldNotBeNil)
                         So(mc, ShouldNotBeNil)
 
                         Convey("basically works", func() {
                                 pm := datastore.PropertyMap{
-                                        "BigData": {datastore.MkProperty([]byte(""))},
-                                        "Value":   {datastore.MkProperty("hi")},
+                                        "BigData": datastore.MkProperty([]byte("")),
+                                        "Value":   datastore.MkProperty("hi"),
                                 }
                                 encoded := append([]byte{0}, serialize.ToBytes(pm)...)
 
                                 o := object{ID: 1, Value: "hi"}
                                 So(ds.Put(&o), ShouldBeNil)
 
                                 o = object{ID: 1}
                                 So(dsUnder.Get(&o), ShouldBeNil)
                                 So(o.Value, ShouldEqual, "hi")
 
@@ skipping 345 matching lines @@
                 InstanceEnabledStatic = false
                 defer func() {
                         InstanceEnabledStatic = true
                 }()
 
                 c := context.Background()
                 newC := FilterRDS(c, nil)
                 So(newC, ShouldEqual, c)
         })
 }