fix: make error messages consistent with go for interop tests

License: MIT
Signed-off-by: achingbrain <[email protected]>

Author: achingbrain

src/core/utils/errors.js

@@ -0,0 +1,22 @@
+'use strict'
+
+class NonFatalError extends Error {
+  constructor (message) {
+    super(message)
+
+    this.code = 0
+  }
+}
+
+class FatalError extends Error {
+  constructor (message) {
+    super(message)
+
+    this.code = 1
+  }
+}
+
+module.exports = {
+  NonFatalError,
+  FatalError
+}

src/core/utils/index.js

@@ -8,6 +8,7 @@ module.exports = {
   countStreamBytes: require('./count-stream-bytes'),
   createLock: require('./create-lock'),
   createNode: require('./create-node'),
+  errors: require('./errors'),
   formatCid: require('./format-cid'),
   limitStreamBytes: require('./limit-stream-bytes'),
   loadNode: require('./load-node'),

src/core/utils/traverse-to.js

@@ -12,6 +12,9 @@ const {
   FILE_SEPARATOR
 } = require('./constants')
 const createNode = require('./create-node')
+const {
+  NonFatalError
+} = require('./errors')
 
 const defaultOptions = {
   parents: false,
@@ -84,15 +87,11 @@ const traverseToMfsObject = (ipfs, path, options, callback) => {
               log(`index ${index} pathSegments.length ${pathSegments.length} pathSegment ${pathSegment} lastComponent ${lastComponent}`, options)
 
               if (lastComponent && !options.createLastComponent) {
-                return done(new Error(`Path ${path.path} does not exist`))
+                log(`Last segment of ${path} did not exist`)
+                return done(new NonFatalError('file does not exist'))
               } else if (!lastComponent && !options.parents) {
-                let message = `Cannot find ${path.path} - ${pathSegment} does not exist`
-
-                if (options.withCreateHint) {
-                  message += ': Try again with the --parents flag to create it'
-                }
-
-                return done(new Error(message))
+                log(`Cannot traverse to ${path} - ${pathSegment} did not exist`)
+                return done(new NonFatalError('file does not exist'))
               }
 
               log(`Adding empty directory '${pathSegment}' to parent ${parent.name}`)

src/http/cp.js

@@ -29,7 +29,7 @@ const mfsCp = (api) => {
           .catch(error => {
             reply({
               Message: error.message,
-              Code: 0,
+              Code: error.code || 0,
               Type: 'error'
             }).code(500).takeover()
           })

src/http/flush.js

@@ -20,7 +20,7 @@ const mfsFlush = (api) => {
           .catch(error => {
             reply({
               Message: error.message,
-              Code: 0,
+              Code: error.code || 0,
               Type: 'error'
             }).code(500).takeover()
           })

src/http/ls.js

@@ -34,7 +34,7 @@ const mfsLs = (api) => {
           .catch(error => {
             reply({
               Message: error.message,
-              Code: 0,
+              Code: error.code || 0,
               Type: 'error'
             }).code(500).takeover()
           })

src/http/mkdir.js

@@ -31,7 +31,7 @@ const mfsMkdir = (api) => {
           .catch(error => {
             reply({
               Message: error.message,
-              Code: 0,
+              Code: error.code || 0,
               Type: 'error'
             }).code(500).takeover()
           })

src/http/mv.js

@@ -29,7 +29,7 @@ const mfsMv = (api) => {
           .catch(error => {
             reply({
               Message: error.message,
-              Code: 0,
+              Code: error.code || 0,
               Type: 'error'
             }).code(500).takeover()
           })

src/http/read.js

@@ -44,7 +44,7 @@ const mfsRead = (api) => {
         stream.once('error', (error) => {
           reply({
             Message: error.message,
-            Code: 0,
+            Code: error.code || 0,
             Type: 'error'
           }).code(500).takeover()
         })

src/http/rm.js

@@ -23,7 +23,7 @@ const mfsRm = (api) => {
           .catch(error => {
             reply({
               Message: error.message,
-              Code: 0,
+              Code: error.code || 0,
               Type: 'error'
             }).code(500).takeover()
           })

src/http/stat.js

@@ -40,7 +40,7 @@ const mfsStat = (api) => {
           .catch(error => {
             reply({
               Message: error.message,
-              Code: 0,
+              Code: error.code || 0,
               Type: 'error'
             }).code(500).takeover()
           })

test/mkdir.spec.js

@@ -55,7 +55,7 @@ describe('mkdir', function () {
       parents: false
     })
       .catch(error => {
-        expect(error.message).to.contain('foo does not exist')
+        expect(error.message).to.contain('does not exist')
       })
   })
 

test/mv.spec.js

@@ -67,7 +67,7 @@ describe('mv', function () {
         throw new Error('File was copied but not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${source} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
   })
 
@@ -88,7 +88,7 @@ describe('mv', function () {
         throw new Error('Directory was copied but not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${source} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
   })
 
@@ -115,7 +115,7 @@ describe('mv', function () {
         throw new Error('Directory was copied but not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Cannot find ${source} - ${directory} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
   })
 })

test/rm.spec.js

@@ -76,7 +76,7 @@ describe('rm', function () {
         throw new Error('File was not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${file} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
   })
 
@@ -100,14 +100,14 @@ describe('rm', function () {
         throw new Error('File #1 was not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${file1} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
       .then(() => mfs.stat(file2))
       .then(() => {
         throw new Error('File #2 was not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${file2} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
   })
 
@@ -123,7 +123,7 @@ describe('rm', function () {
         throw new Error('Directory was not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${directory} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
   })
 
@@ -143,14 +143,14 @@ describe('rm', function () {
         throw new Error('File was not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${subdirectory} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
       .then(() => mfs.ls(directory))
       .then(() => {
         throw new Error('Directory was not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${directory} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
   })
 
@@ -170,14 +170,14 @@ describe('rm', function () {
         throw new Error('File was not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`Path ${file} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
       .then(() => mfs.stat(`/${directory}`))
       .then(() => {
         throw new Error('Directory was not removed')
       })
       .catch(error => {
-        expect(error.message).to.contain(`${directory} does not exist`)
+        expect(error.message).to.contain('does not exist')
       })
   })
 })

test/stat.spec.js

@@ -57,7 +57,7 @@ describe('stat', function () {
         throw new Error('No error was thrown for a non-existent file')
       })
       .catch(error => {
-        expect(error.message).to.contain('Path /i-do-not-exist does not exist')
+        expect(error.message).to.contain('does not exist')
       })
   })