chore: update error messages for interop tests

Author: achingbrain

src/cli/mkdir.js

@@ -29,8 +29,9 @@ module.exports = {
     flush: {
       alias: 'f',
       type: 'boolean',
+      default: true,
       coerce: asBoolean,
-      describe: 'Weird undocumented option'
+      describe: 'Flush the changes to disk immediately'
     }
   },
 

src/core/cp.js

@@ -58,7 +58,7 @@ module.exports = (ipfs) => {
         return copyToDirectory(ipfs, sources, destination, options, callback)
       }
 
-      callback(new Error('Error: directory already has entry by that name'))
+      callback(new Error('directory already has entry by that name'))
     })
   }
 }
@@ -70,7 +70,7 @@ const copyToFile = (ipfs, source, destination, options, callback) => {
         (next) => stat(ipfs)(source.path, options, next),
         (next) => stat(ipfs)(destination.path, options, (error) => {
           if (!error) {
-            return next(new Error('Error: directory already has entry by that name'))
+            return next(new Error('directory already has entry by that name'))
           }
 
           next()
@@ -125,7 +125,7 @@ const copyToDirectory = (ipfs, sources, destination, options, callback) => {
               return (cb) => {
                 stat(ipfs)(`${destination.path}/${source.name}`, options, (error) => {
                   if (!error) {
-                    return cb(new Error('Error: directory already has entry by that name'))
+                    return cb(new Error('directory already has entry by that name'))
                   }
 
                   cb()

src/core/mkdir.js

@@ -33,7 +33,7 @@ module.exports = (ipfs) => {
     path = path.trim()
 
     if (path === FILE_SEPARATOR) {
-      return callback(options.parents ? null : new Error(`Error: cannot create directory '${FILE_SEPARATOR}': Already exists`))
+      return callback(options.parents ? null : new Error(`cannot create directory '${FILE_SEPARATOR}': Already exists`))
     }
 
     log(`Creating ${path}`)
@@ -45,7 +45,7 @@ module.exports = (ipfs) => {
           createLastComponent: false
         }, (error) => {
           if (!error) {
-            log(`${path} already existed`)
+            log(`${path} already exists`)
             return cb(new Error('file already exists'))
           }
 
@@ -65,7 +65,7 @@ module.exports = (ipfs) => {
       (result, cb) => updateTree(ipfs, result, cb),
       (newRoot, next) => updateMfsRoot(ipfs, newRoot.node.multihash, next)
     ], (error) => {
-      if (error && error.message === 'Already exists' && options.parents) {
+      if (error && error.message.includes('file already exists') && options.parents) {
         // when the directory already exists and we are creating intermediate
         // directories, do not error out (consistent with mkdir -p)
         error = null

src/core/read-pull-stream.js

@@ -35,7 +35,7 @@ module.exports = (ipfs) => {
         const meta = UnixFs.unmarshal(node.data)
 
         if (meta.type !== 'file') {
-          return done(new Error(`Error: ${path} was not a file`))
+          return done(new Error(`${path} was not a file`))
         }
 
         waterfall([

test/mkdir.spec.js

@@ -86,6 +86,17 @@ describe('mkdir', function () {
       })
   })
 
+  it('does not error when creating a directory that already exists and parents is true', () => {
+    const path = '/qux/quux/quuux'
+
+    return mfs.mkdir(path, {
+      parents: true
+    })
+      .then(() => mfs.mkdir(path, {
+        parents: true
+      }))
+  })
+
   it('creates a nested directory when -p is true', function () {
     const path = '/foo/bar/baz'