aboutsummaryrefslogtreecommitdiff
path: root/cmd/bolt/keys_test.go
diff options
context:
space:
mode:
authorBen Johnson <benbjohnson@yahoo.com>2014-04-11 14:31:34 -0600
committerBen Johnson <benbjohnson@yahoo.com>2014-04-11 14:31:34 -0600
commit714436100adf98a5132e6f4ddb3290231ff89dfd (patch)
tree8a9272322aa759b3d911d3698e6ec21cf71e78d7 /cmd/bolt/keys_test.go
parentAdd nested buckets. (diff)
parentMerge pull request #128 from benbjohnson/import-export (diff)
downloaddedo-714436100adf98a5132e6f4ddb3290231ff89dfd.tar.gz
dedo-714436100adf98a5132e6f4ddb3290231ff89dfd.tar.xz
Merge branch 'master' into nested-keys
Conflicts: db_test.go tx_test.go
Diffstat (limited to 'cmd/bolt/keys_test.go')
-rw-r--r--cmd/bolt/keys_test.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/cmd/bolt/keys_test.go b/cmd/bolt/keys_test.go
index c426836..ea530f6 100644
--- a/cmd/bolt/keys_test.go
+++ b/cmd/bolt/keys_test.go
@@ -11,7 +11,7 @@ import (
// Ensure that a list of keys can be retrieved for a given bucket.
func TestKeys(t *testing.T) {
SetTestMode(true)
- open(func(db *bolt.DB) {
+ open(func(db *bolt.DB, path string) {
db.Update(func(tx *bolt.Tx) error {
tx.CreateBucket("widgets")
tx.Bucket("widgets").Put([]byte("0002"), []byte(""))
@@ -19,7 +19,8 @@ func TestKeys(t *testing.T) {
tx.Bucket("widgets").Put([]byte("0003"), []byte(""))
return nil
})
- output := run("keys", db.Path(), "widgets")
+ db.Close()
+ output := run("keys", path, "widgets")
assert.Equal(t, "0001\n0002\n0003", output)
})
}
@@ -34,8 +35,9 @@ func TestKeysDBNotFound(t *testing.T) {
// Ensure that an error is reported if the bucket is not found.
func TestKeysBucketNotFound(t *testing.T) {
SetTestMode(true)
- open(func(db *bolt.DB) {
- output := run("keys", db.Path(), "widgets")
+ open(func(db *bolt.DB, path string) {
+ db.Close()
+ output := run("keys", path, "widgets")
assert.Equal(t, "bucket not found: widgets", output)
})
}