feat: disable preload by default in test/CI environments

resolves #1815 License: MIT Signed-off-by: Alan Shaw <[email protected]>
ipfs · Jan 15, 2019 · cd1d53a · cd1d53a
1 parent 6de6adf
commit cd1d53a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -88,6 +88,7 @@
     "boom": "^7.2.0",
     "bs58": "^4.0.1",
     "byteman": "^1.3.5",
+    "ci-info": "^2.0.0",
     "cid-tool": "~0.2.0",
     "cids": "~0.5.5",
     "class-is": "^1.1.0",

diff --git a/src/core/config.js b/src/core/config.js
@@ -9,7 +9,7 @@ const schema = Joi.object().keys({
   ).allow(null),
   repoOwner: Joi.boolean().default(true),
   preload: Joi.object().keys({
-    enabled: Joi.boolean().default(true),
+    enabled: Joi.boolean(),
     addresses: Joi.array().items(Joi.multiaddr().options({ convert: false })),
     interval: Joi.number().integer().default(30 * 1000)
   }).allow(null),

diff --git a/src/core/mfs-preload.js b/src/core/mfs-preload.js
@@ -1,12 +1,16 @@
 'use strict'
 
 const debug = require('debug')
+const { isCI } = require('ci-info')
 
 const log = debug('jsipfs:mfs-preload')
 log.error = debug('jsipfs:mfs-preload:error')
 
 module.exports = (self) => {
   const options = self._options.preload || {}
+  options.enabled = options.enabled == null
+    ? !(isCI || process.env.NODE_ENV === 'test')
+    : Boolean(options.enabled)
   options.interval = options.interval || 30 * 1000
 
   if (!options.enabled) {

diff --git a/src/core/preload.js b/src/core/preload.js
@@ -5,6 +5,7 @@ const retry = require('async/retry')
 const toUri = require('multiaddr-to-uri')
 const debug = require('debug')
 const CID = require('cids')
+const { isCI } = require('ci-info')
 const preload = require('./runtime/preload-nodejs')
 
 const log = debug('jsipfs:preload')
@@ -14,10 +15,13 @@ const noop = (err) => { if (err) log.error(err) }
 
 module.exports = self => {
   const options = self._options.preload || {}
-  options.enabled = Boolean(options.enabled)
+  options.enabled = options.enabled == null
+    ? !(isCI || process.env.NODE_ENV === 'test')
+    : Boolean(options.enabled)
   options.addresses = options.addresses || []
 
   if (!options.enabled || !options.addresses.length) {
+    log('preload disabled')
     const api = (_, callback) => {
       if (callback) {
         setImmediate(() => callback())