From 3a98d8593cd03e8c65ccaa0f2df7b3f07e156c33 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Tue, 18 Dec 2018 09:09:25 -0600
Subject: [PATCH] fix mkdir tests #233

---
 backend/app/cmd/cmd.go         | 4 +---
 backend/app/cmd/server_test.go | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/backend/app/cmd/cmd.go b/backend/app/cmd/cmd.go
index fc9dd43c..da177b85 100644
--- a/backend/app/cmd/cmd.go
+++ b/backend/app/cmd/cmd.go
@@ -102,9 +102,7 @@ func responseError(resp *http.Response) error {
 // mkdir -p for all dirs
 func makeDirs(dirs ...string) error {
 	for _, dir := range dirs {
-		// From docs: "If path is already a directory, MkdirAll does nothing
-		// and returns nil".
-		if err := os.MkdirAll(dir, 0700); err != nil {
+		if err := os.MkdirAll(dir, 0700); err != nil { // If path is already a directory, MkdirAll does nothing
 			return errors.Wrapf(err, "can't make directory %s", dir)
 		}
 	}
diff --git a/backend/app/cmd/server_test.go b/backend/app/cmd/server_test.go
index 3a1835b1..3b5f67c1 100644
--- a/backend/app/cmd/server_test.go
+++ b/backend/app/cmd/server_test.go
@@ -196,8 +196,7 @@ func TestServerApp_Failed(t *testing.T) {
 	_, err := p.ParseArgs([]string{"--backup=/tmp", "--store.bolt.path=/dev/null"})
 	assert.Nil(t, err)
 	_, err = opts.newServerApp()
-	assert.EqualError(t, err, "failed to make data store engine: can't initialize data store: failed to make boltdb for /dev/null/remark.db: "+
-		"open /dev/null/remark.db: not a directory")
+	assert.EqualError(t, err, "failed to make data store engine: failed to create bolt store: can't make directory /dev/null: mkdir /dev/null: not a directory")
 	t.Log(err)
 
 	// RO backup location
@@ -207,7 +206,7 @@ func TestServerApp_Failed(t *testing.T) {
 	_, err = p.ParseArgs([]string{"--store.bolt.path=/tmp", "--backup=/dev/null/not-writable"})
 	assert.Nil(t, err)
 	_, err = opts.newServerApp()
-	assert.EqualError(t, err, "can't check directory status for /dev/null/not-writable: stat /dev/null/not-writable: not a directory")
+	assert.EqualError(t, err, "can't make directory /dev/null/not-writable: mkdir /dev/null: not a directory")
 	t.Log(err)
 
 	// invalid url