fix: remove CLI preload arg not recognised by ipfsd-ctl

Alan Shaw · Alan Shaw · commit 57eab3075164 · 2019-06-27T13:30:49.000+01:00
License: MIT
Signed-off-by: Alan Shaw &lt;alan.shaw@protocol.ai&gt;
diff --git a/test/core/bitswap.spec.js b/test/core/bitswap.spec.js
@@ -77,7 +77,6 @@ function addNode (fDaemon, inProcNode, callback) {
       },
       Bootstrap: []
     },
-    args: ['--enable-preload=false'],
     preload: { enabled: false }
   }, (err, ipfsd) => {
     expect(err).to.not.exist()
diff --git a/test/core/files-sharding.spec.js b/test/core/files-sharding.spec.js
@@ -89,7 +89,7 @@ describe('files directory (sharding tests)', () => {
       df.spawn({
         exec: IPFS,
         initOptions: { bits: 512 },
-        args: ['--enable-sharding-experiment', '--enable-preload=false'],
+        args: ['--enable-sharding-experiment'],
         config: {
           Addresses: {
             Swarm: []
diff --git a/test/core/ping.spec.js b/test/core/ping.spec.js
@@ -29,7 +29,7 @@ const config = {
 }
 
 function spawnNode ({ dht = false, type = 'js' }, cb) {
-  const args = dht ? ['--enable-preload=false'] : ['--offline', '--enable-preload=false']
+  const args = dht ? [] : ['--offline']
   const factory = type === 'js' ? df : dfProc
   factory.spawn({
     args,
diff --git a/test/http-api/block.js b/test/http-api/block.js
@@ -22,7 +22,7 @@ describe('block endpoint', () => {
     df.spawn({
       initOptions: { bits: 512 },
       config: { Bootstrap: [] },
-      args: ['--enable-preload=false']
+      args: []
     }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
diff --git a/test/http-api/bootstrap.js b/test/http-api/bootstrap.js
@@ -28,8 +28,7 @@ describe('bootstrap endpoint', () => {
             Enabled: false
           }
         }
-      },
-      args: ['--enable-preload=false']
+      }
     }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
diff --git a/test/http-api/config.js b/test/http-api/config.js
@@ -47,8 +47,7 @@ skipOnWindows('config endpoint', () => {
           initOptions: { bits: 512 },
           config: { Bootstrap: [] },
           disposable: false,
-          start: true,
-          args: ['--enable-preload=false']
+          start: true
         }, cb),
         (_ipfsd, cb) => {
           ipfsd = _ipfsd
diff --git a/test/http-api/dns.js b/test/http-api/dns.js
@@ -16,8 +16,7 @@ describe('dns endpoint', () => {
     this.timeout(20 * 1000)
     df.spawn({
       initOptions: { bits: 512 },
-      config: { Bootstrap: [] },
-      args: ['--enable-preload=false']
+      config: { Bootstrap: [] }
     }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
diff --git a/test/http-api/files.js b/test/http-api/files.js
@@ -20,8 +20,7 @@ describe('.files', () => {
     this.timeout(20 * 1000)
     df.spawn({
       initOptions: { bits: 512 },
-      config: { Bootstrap: [] },
-      args: ['--enable-preload=false']
+      config: { Bootstrap: [] }
     }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
diff --git a/test/http-api/id.js b/test/http-api/id.js
@@ -35,8 +35,7 @@ skipOnWindows('id endpoint', () => {
           initOptions: { bits: 512 },
           config: { Bootstrap: [] },
           disposable: false,
-          start: true,
-          args: ['--enable-preload=false']
+          start: true
         }, cb),
         (_ipfsd, cb) => {
           ipfsd = _ipfsd
diff --git a/test/http-api/object.js b/test/http-api/object.js
@@ -43,8 +43,7 @@ describe('object endpoint', () => {
             Enabled: false
           }
         }
-      },
-      args: ['--enable-preload=false']
+      }
     }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
diff --git a/test/http-api/version.js b/test/http-api/version.js
@@ -26,8 +26,7 @@ describe('version endpoint', () => {
             Enabled: false
           }
         }
-      },
-      args: ['--enable-preload=false']
+      }
     }, (err, _ipfsd) => {
       expect(err).to.not.exist()
       ipfsd = _ipfsd
diff --git a/test/utils/interface-common-factory.js b/test/utils/interface-common-factory.js
@@ -23,7 +23,6 @@ function createFactory (options) {
         }
       }
     },
-    args: ['--enable-preload=false'],
     preload: { enabled: false }
   }
 
diff --git a/test/utils/on-and-off.js b/test/utils/on-and-off.js
@@ -56,8 +56,7 @@ function on (tests) {
         type: 'js',
         exec: path.resolve(`${__dirname}/../../src/cli/bin.js`),
         initOptions: { bits: 512 },
-        config: { Bootstrap: [] },
-        args: ['--enable-preload=false']
+        config: { Bootstrap: [] }
       }, (err, node) => {
         expect(err).to.not.exist()
         ipfsd = node

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ const config = {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`function spawnNode ({ dht = false, type = 'js' }, cb) {`
`32`		`- const args = dht ? ['--enable-preload=false'] : ['--offline', '--enable-preload=false']`
	`32`	`+ const args = dht ? [] : ['--offline']`
`33`	`33`	`const factory = type === 'js' ? df : dfProc`
`34`	`34`	`factory.spawn({`
`35`	`35`	`args,`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ describe('bootstrap endpoint', () => {`
`28`	`28`	`Enabled: false`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`- },`
`32`		`- args: ['--enable-preload=false']`
	`31`	`+ }`
`33`	`32`	`}, (err, _ipfsd) => {`
`34`	`33`	`expect(err).to.not.exist()`
`35`	`34`	`ipfsd = _ipfsd`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ describe('object endpoint', () => {`
`43`	`43`	`Enabled: false`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`- },`
`47`		`- args: ['--enable-preload=false']`
	`46`	`+ }`
`48`	`47`	`}, (err, _ipfsd) => {`
`49`	`48`	`expect(err).to.not.exist()`
`50`	`49`	`ipfsd = _ipfsd`