OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // adapted from github.com/golang/appengine/datastore | 5 // adapted from github.com/golang/appengine/datastore |
6 | 6 |
7 package datastore | 7 package datastore |
8 | 8 |
9 import ( | 9 import ( |
10 "bytes" | 10 "bytes" |
11 "fmt" | 11 "fmt" |
12 "io/ioutil" | 12 "io/ioutil" |
13 "os" | 13 "os" |
14 "path/filepath" | 14 "path/filepath" |
15 "runtime" | 15 "runtime" |
16 "testing" | 16 "testing" |
17 | 17 |
18 "github.com/luci/gae/service/info" | 18 "github.com/luci/gae/service/info" |
19 "github.com/luci/luci-go/common/errors" | 19 "github.com/luci/luci-go/common/errors" |
20 . "github.com/luci/luci-go/common/testing/assertions" | 20 . "github.com/luci/luci-go/common/testing/assertions" |
21 . "github.com/smartystreets/goconvey/convey" | 21 . "github.com/smartystreets/goconvey/convey" |
22 "golang.org/x/net/context" | 22 "golang.org/x/net/context" |
23 ) | 23 ) |
24 | 24 |
25 func fakeDatastoreFactory(c context.Context, wantTxn bool) RawInterface { | 25 func fakeDatastoreFactory(c context.Context, wantTxn bool) RawInterface { |
26 i := info.Get(c) | 26 i := info.Get(c) |
27 » return &fakeDatastore{ | 27 » fds := fakeDatastore{ |
28 aid: i.FullyQualifiedAppID(), | 28 aid: i.FullyQualifiedAppID(), |
29 ns: i.GetNamespace(), | |
30 } | 29 } |
| 30 fds.ns, _ = i.GetNamespace() |
| 31 return &fds |
31 } | 32 } |
32 | 33 |
33 type fakeDatastore struct { | 34 type fakeDatastore struct { |
34 RawInterface | 35 RawInterface |
35 aid string | 36 aid string |
36 ns string | 37 ns string |
37 } | 38 } |
38 | 39 |
39 func (f *fakeDatastore) mkKey(elems ...interface{}) *Key { | 40 func (f *fakeDatastore) mkKey(elems ...interface{}) *Key { |
40 return MakeKey(f.aid, f.ns, elems...) | 41 return MakeKey(f.aid, f.ns, elems...) |
(...skipping 1536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1577 if err != nil { | 1578 if err != nil { |
1578 panic(fmt.Errorf("failed to find absolute path f
or `%s`", sameLevelDir)) | 1579 panic(fmt.Errorf("failed to find absolute path f
or `%s`", sameLevelDir)) |
1579 } | 1580 } |
1580 | 1581 |
1581 ids, err := FindAndParseIndexYAML(abs) | 1582 ids, err := FindAndParseIndexYAML(abs) |
1582 So(err, ShouldBeNil) | 1583 So(err, ShouldBeNil) |
1583 So(ids[1].Kind, ShouldEqual, "Test Foo") | 1584 So(ids[1].Kind, ShouldEqual, "Test Foo") |
1584 }) | 1585 }) |
1585 }) | 1586 }) |
1586 } | 1587 } |
OLD | NEW |