no gateway tests using harcoded ports

test/gateway/index.js

@@ -33,6 +33,11 @@ describe('HTTP Gateway', function () {
     const repoPath = path.join(os.tmpdir(), '/ipfs-' + hat())
 
     http.api = new API(repoPath, {
+      Addresses: {
+        Swarm: ['/ip4/127.0.0.1/tcp/0'],
+        API: '/ip4/127.0.0.1/tcp/0',
+        Gateway: '/ip4/127.0.0.1/tcp/0'
+      },
       Bootstrap: [],
       Discovery: {
         MDNS: {

test/http-api/extra/block.js

@@ -8,8 +8,13 @@ chai.use(dirtyChai)
 
 const multihash = require('multihashes')
 const waterfall = require('async/waterfall')
+const getCtl = require('./utils/get-ctl.js')
 
-module.exports = (ctl) => {
+module.exports = (http) => {
+  let ctl = null
+  before(() => {
+    ctl = getCtl(http)
+  })
   describe('.block', () => {
     describe('.put', () => {
       it('updates value', (done) => {

test/http-api/extra/bootstrap.js

@@ -5,8 +5,13 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+const getCtl = require('./utils/get-ctl.js')
 
-module.exports = (ctl) => {
+module.exports = (http) => {
+  let ctl = null
+  before(() => {
+    ctl = getCtl(http)
+  })
   describe('.bootstrap', () => {
     const invalidArg = 'this/Is/So/Invalid/'
     const validIp4 = '/ip4/101.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z'

test/http-api/extra/config.js

@@ -8,8 +8,13 @@ chai.use(dirtyChai)
 
 const fs = require('fs')
 const path = require('path')
+const getCtl = require('./utils/get-ctl.js')
 
-module.exports = (ctl) => {
+module.exports = (http) => {
+  let ctl = null
+  before(() => {
+    ctl = getCtl(http)
+  })
   describe('.config', () => {
     const configPath = path.join(__dirname, '../../repo-tests-run/config')
 

test/http-api/extra/dns.js

@@ -5,8 +5,13 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+const getCtl = require('./utils/get-ctl.js')
 
-module.exports = (ctl) => {
+module.exports = (http) => {
+  let ctl = null
+  before(() => {
+    ctl = getCtl(http)
+  })
   describe('.dns', () => {
     it('resolve ipfs.io dns', (done) => {
       ctl.dns('ipfs.io', (err, result) => {

test/http-api/extra/id.js

@@ -5,8 +5,13 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+const getCtl = require('./utils/get-ctl.js')
 
-module.exports = (ctl) => {
+module.exports = (http) => {
+  let ctl = null
+  before(() => {
+    ctl = getCtl(http)
+  })
   describe('.id', () => {
     it('get the identity', (done) => {
       ctl.id((err, result) => {

test/http-api/extra/object.js

@@ -10,6 +10,7 @@ chai.use(dirtyChai)
 const fs = require('fs')
 const dagPB = require('ipld-dag-pb')
 const DAGLink = dagPB.DAGLink
+const getCtl = require('./utils/get-ctl.js')
 
 function asJson (cb) {
   return (err, result) => {
@@ -19,7 +20,11 @@ function asJson (cb) {
   }
 }
 
-module.exports = (ctl) => {
+module.exports = (http) => {
+  let ctl = null
+  before(() => {
+    ctl = getCtl(http)
+  })
   describe('.object', () => {
     it('.new', (done) => {
       ctl.object.new(asJson((err, res) => {

test/http-api/extra/utils/get-ctl.js

@@ -0,0 +1,5 @@
+'use strict'
+const APIctl = require('ipfs-api')
+module.exports = (http) => {
+  return APIctl(http.api.apiMultiaddr)
+}

test/http-api/extra/version.js

@@ -5,8 +5,13 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+const getCtl = require('./utils/get-ctl.js')
 
-module.exports = (ctl) => {
+module.exports = (http) => {
+  let ctl = null
+  before(() => {
+    ctl = getCtl(http)
+  })
   describe('.version', () => {
     it('get the version', (done) => {
       ctl.version((err, result) => {

test/http-api/index.js

@@ -8,7 +8,6 @@ const expect = chai.expect
 chai.use(dirtyChai)
 const hat = require('hat')
 const API = require('../../src/http')
-const APIctl = require('ipfs-api')
 const ncp = require('ncp').ncp
 const path = require('path')
 const clean = require('../utils/clean')
@@ -19,19 +18,35 @@ describe('HTTP API', () => {
 
   let http = {}
 
-  before(function (done) {
-    this.timeout(60 * 1000)
-
+  const startHttpAPI = (cb) => {
     const options = {
       pass: hat(),
       enablePubsubExperiment: true
     }
     http.api = new API(repoTests, null, options)
 
     ncp(repoExample, repoTests, (err) => {
-      expect(err).to.not.exist()
+      if (err) {
+        return cb(err)
+      }
+
+      http.api.start(false, (err) => {
+        if (err) {
+          return cb(err)
+        }
+        cb(null, http)
+      })
+    })
+  }
 
-      http.api.start(false, done)
+  before(function (done) {
+    this.timeout(60 * 1000)
+    startHttpAPI((err, _http) => {
+      if (err) {
+        throw err
+      }
+      http = _http
+      done()
     })
   })
 
@@ -52,9 +67,13 @@ describe('HTTP API', () => {
   })
 
   describe('## extra tests with ipfs-api', () => {
-    const ctl = APIctl('/ip4/127.0.0.1/tcp/6001')
-
     fs.readdirSync(path.join(__dirname, '/extra'))
-      .forEach((file) => require('./extra/' + file)(ctl))
+      .forEach((file) => {
+        // todo(victor) want to make all this loading of tests proper, but for now
+        if (file.includes('utils')) {
+          return
+        }
+        require('./extra/' + file)(http)
+      })
   })
 })