From 750e0997c8d93fbc1a285f5d0af98e37124399c5 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Tue, 14 Apr 2020 15:25:19 +0300 Subject: [PATCH 1/2] fix: sort expected and actual refs sorting allows any iteration order. --- packages/interface-ipfs-core/src/refs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/interface-ipfs-core/src/refs.js b/packages/interface-ipfs-core/src/refs.js index 1645937a09..0490f7313e 100644 --- a/packages/interface-ipfs-core/src/refs.js +++ b/packages/interface-ipfs-core/src/refs.js @@ -64,8 +64,9 @@ module.exports = (common, options) => { const refs = await all(ipfs.refs(p, params)) + // Sort the refs not to lock-in the iteration order // Check there was no error and the refs match what was expected - expect(refs.map(r => r.ref)).to.eql(expected) + expect(refs.map(r => r.ref).sort()).to.eql(expected.sort()) }) } From cd2b5d35dc45c387fbc2d94ce9c50508caf7eff5 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Tue, 14 Apr 2020 15:29:37 +0300 Subject: [PATCH 2/2] refactor: use cids in recursive+unique test cids instead of linknames doesn't lock down the iteration algorithm. --- packages/interface-ipfs-core/src/refs.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/interface-ipfs-core/src/refs.js b/packages/interface-ipfs-core/src/refs.js index 0490f7313e..5ec99ffc85 100644 --- a/packages/interface-ipfs-core/src/refs.js +++ b/packages/interface-ipfs-core/src/refs.js @@ -199,19 +199,19 @@ function getRefsTests () { }, 'should get refs with recursive and unique option': { - params: { format: '', recursive: true, unique: true }, + params: { format: '', recursive: true, unique: true }, expected: [ - 'animals', - 'land', - 'african.txt', - 'americas.txt', - 'australian.txt', - 'sea', - 'atlantic.txt', - 'indian.txt', - 'fruits', - 'tropical.txt', - 'mushroom.txt' + 'QmRfqT4uTUgFXhWbfBZm6eZxi2FQ8pqYK5tcWRyTZ7RcgY', + 'QmUXzZKa3xhTauLektUiK4GiogHskuz1c57CnnoP4TgYJD', + 'QmVX54jfjB8eRxLVxyQSod6b1FyDh7mR4mQie9j97i2Qk3', + 'QmWEuXAjUGyndgr4MKqMBgzMW36XgPgvitt2jsXgtuc7JE', + 'QmYEJ7qQNZUvBnv4SZ3rEbksagaan3sGvnUq948vSG8Z34', + 'QmYLvZrFn8KE2bcJ9UFhthScBVbbcXEgkJnnCBeKWYkpuQ', + 'Qma5z9bmwPcrWLJxX6Vj6BrcybaFg84c2riNbUKrSVf8h1', + 'QmbrFTo4s6H23W6wmoZKQC2vSogGeQ4dYiceSqJddzrKVa', + 'QmdHVR8M4zAdGctnTYq4fyPZjTwwzdcBpGWAfMAhAVfT9n', + 'Qmf6MrqT2oAve9diagLTMCYFPEcSx7fnUdW3xAjhXm32vo', + 'QmfP6D9bRV4FEYDL4EHZtZG58kDwDfnzmyjuyK5d1pvzbM' ] },