From ec392683f2766e237b63fb888d849ad21f19f30d Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Thu, 2 Aug 2018 10:55:25 -0700 Subject: [PATCH 1/5] test: enable bitswap tests on windows closes #1313 License: MIT Signed-off-by: Alan Shaw --- test/core/interface.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/interface.spec.js b/test/core/interface.spec.js index 07fb19a6b5..5bacb21602 100644 --- a/test/core/interface.spec.js +++ b/test/core/interface.spec.js @@ -8,7 +8,7 @@ const isNode = require('detect-node') describe('interface-ipfs-core tests', () => { const defaultCommonFactory = CommonFactory.create() - tests.bitswap(defaultCommonFactory, { skip: !isNode }) + tests.bitswap(defaultCommonFactory) tests.block(defaultCommonFactory) From ca56587f91a0211fd7fbbb89af8680b12611155e Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 6 Aug 2018 15:25:01 +0100 Subject: [PATCH 2/5] chore: update ipfs-mfs dep License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 00ce13e516..21c3c3ed1f 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "ipfs-block": "~0.7.1", "ipfs-block-service": "~0.14.0", "ipfs-http-response": "~0.1.2", - "ipfs-mfs": "~0.2.3", + "ipfs-mfs": "~0.2.5", "ipfs-multipart": "~0.1.0", "ipfs-repo": "~0.22.1", "ipfs-unixfs": "~0.1.15", From e9166fd0e43f43438d33e11ad5fef76366882d14 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 6 Aug 2018 19:36:14 +0100 Subject: [PATCH 3/5] test: enable bitswap tests on windows License: MIT Signed-off-by: Alan Shaw --- test/core/bitswap.spec.js | 7 +------ test/core/interface.spec.js | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test/core/bitswap.spec.js b/test/core/bitswap.spec.js index 645581f2c1..ebadb2b99b 100644 --- a/test/core/bitswap.spec.js +++ b/test/core/bitswap.spec.js @@ -20,11 +20,6 @@ const IPFSFactory = require('ipfsd-ctl') const IPFS = require('../../src/core') -// TODO bitswap tests on windows is failing, missing proper shutdown of daemon -// https://github.com/ipfs/js-ipfsd-ctl/pull/205 -const isWindows = require('../utils/platforms').isWindows -const skipOnWindows = isWindows() ? describe.skip : describe - function makeBlock (callback) { const d = Buffer.from(`IPFS is awesome ${Math.random()}`) @@ -89,7 +84,7 @@ function addNode (fDaemon, inProcNode, callback) { }) } -skipOnWindows('bitswap', function () { +describe('bitswap', function () { this.timeout(80 * 1000) let inProcNode // Node spawned inside this process diff --git a/test/core/interface.spec.js b/test/core/interface.spec.js index 5bacb21602..07fb19a6b5 100644 --- a/test/core/interface.spec.js +++ b/test/core/interface.spec.js @@ -8,7 +8,7 @@ const isNode = require('detect-node') describe('interface-ipfs-core tests', () => { const defaultCommonFactory = CommonFactory.create() - tests.bitswap(defaultCommonFactory) + tests.bitswap(defaultCommonFactory, { skip: !isNode }) tests.block(defaultCommonFactory) From c0d3e2956b37bddc4be296b618236b6d756fa731 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Tue, 7 Aug 2018 10:14:31 +0100 Subject: [PATCH 4/5] chore: use latest ipfsd-ctl License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 21c3c3ed1f..d1faf41348 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "form-data": "^2.3.2", "hat": "0.0.3", "interface-ipfs-core": "~0.75.1", - "ipfsd-ctl": "~0.39.0", + "ipfsd-ctl": "github:ipfs/js-ipfsd-ctl", "mocha": "^5.2.0", "ncp": "^2.0.0", "nexpect": "~0.5.0", From 9dfada3b3c56b9a6b8b851a5d01c026a077b378b Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Tue, 7 Aug 2018 10:56:20 +0100 Subject: [PATCH 5/5] chore: update ipfsd-ctl dependency License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d1faf41348..cca64e6917 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "form-data": "^2.3.2", "hat": "0.0.3", "interface-ipfs-core": "~0.75.1", - "ipfsd-ctl": "github:ipfs/js-ipfsd-ctl", + "ipfsd-ctl": "~0.39.1", "mocha": "^5.2.0", "ncp": "^2.0.0", "nexpect": "~0.5.0",