Merge branch 'master' into nested-keys

Conflicts:
	db_test.go
	tx_test.go

1 files changed, 7 insertions, 5 deletions

diff --git a/cmd/bolt/set_test.go b/cmd/bolt/set_test.go
index d76b3c0..519d888 100644
--- a/cmd/bolt/set_test.go
+++ b/cmd/bolt/set_test.go
@@ -11,13 +11,14 @@ import (
 // Ensure that a value can be set from the CLI.
 func TestSet(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")
 			return nil
 		})
-		assert.Equal(t, "", run("set", db.Path(), "widgets", "foo", "bar"))
-		assert.Equal(t, "bar", run("get", db.Path(), "widgets", "foo"))
+		db.Close()
+		assert.Equal(t, "", run("set", path, "widgets", "foo", "bar"))
+		assert.Equal(t, "bar", run("get", path, "widgets", "foo"))
 	})
 }
 
@@ -31,8 +32,9 @@ func TestSetDBNotFound(t *testing.T) {
 // Ensure that an error is reported if the bucket is not found.
 func TestSetBucketNotFound(t *testing.T) {
 	SetTestMode(true)
-	open(func(db *bolt.DB) {
-		output := run("set", db.Path(), "widgets", "foo", "bar")
+	open(func(db *bolt.DB, path string) {
+		db.Close()
+		output := run("set", path, "widgets", "foo", "bar")
 		assert.Equal(t, "bucket not found: widgets", output)
 	})
 }