chore: windows build fixes (#2793)

achingbrain · web-flow · commit f351dd5b9037 · 2020-02-24T09:33:30.000-05:00
Stop things that were started and checkout things with the right
line endings.

Must move gateway fixtures to fixtures dir, or preferably generate
data during the tests.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
 * text=auto
 **/test/fixtures/** text eol=lf
+**/test/gateway/** text eol=lf
 **/src/init-files/** text eol=lf
 
 *.data binary
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,6 @@ docs
 
 # Deployment files
 .npmrc
+
+# Editor files
+.vscode
diff --git a/packages/interface-ipfs-core/src/add.js b/packages/interface-ipfs-core/src/add.js
@@ -458,7 +458,7 @@ module.exports = (common, options) => {
     })
 
     it('should add from a HTTP URL', async () => {
-      const text = `TEST${Date.now()}`
+      const text = `TEST${Math.random()}`
       const url = echoUrl(text)
 
       const [result, expectedResult] = await Promise.all([
@@ -474,7 +474,7 @@ module.exports = (common, options) => {
     })
 
     it('should add from a HTTP URL with redirection', async () => {
-      const text = `TEST${Date.now()}`
+      const text = `TEST${Math.random()}`
       const url = echoUrl(text) + '?foo=bar#buzz'
 
       const [result, expectedResult] = await Promise.all([
@@ -490,7 +490,7 @@ module.exports = (common, options) => {
     })
 
     it('should add from a URL with only-hash=true', async function () {
-      const text = `TEST${Date.now()}`
+      const text = `TEST${Math.random()}`
       const url = echoUrl(text)
 
       const res = await all(ipfs.add(urlSource(url), { onlyHash: true }))
diff --git a/packages/interface-ipfs-core/src/block/get.js b/packages/interface-ipfs-core/src/block/get.js
@@ -54,7 +54,7 @@ module.exports = (common, options) => {
     })
 
     it('should get a block added as CIDv0 with a CIDv1', async () => {
-      const input = Buffer.from(`TEST${Date.now()}`)
+      const input = Buffer.from(`TEST${Math.random()}`)
 
       const res = await ipfs.block.put(input, { version: 0 })
 
@@ -68,7 +68,7 @@ module.exports = (common, options) => {
     })
 
     it('should get a block added as CIDv1 with a CIDv0', async () => {
-      const input = Buffer.from(`TEST${Date.now()}`)
+      const input = Buffer.from(`TEST${Math.random()}`)
 
       const res = await ipfs.block.put(input, { version: 1 })
 
diff --git a/packages/interface-ipfs-core/src/block/put.js b/packages/interface-ipfs-core/src/block/put.js
@@ -56,7 +56,7 @@ module.exports = (common, options) => {
     })
 
     it('should put a buffer, using options', async () => {
-      const blob = Buffer.from(`TEST${Date.now()}`)
+      const blob = Buffer.from(`TEST${Math.random()}`)
 
       const block = await ipfs.block.put(blob, {
         format: 'raw',
diff --git a/packages/interface-ipfs-core/src/cat.js b/packages/interface-ipfs-core/src/cat.js
@@ -50,7 +50,7 @@ module.exports = (common, options) => {
     })
 
     it('should cat a file added as CIDv0 with a CIDv1', async () => {
-      const input = Buffer.from(`TEST${Date.now()}`)
+      const input = Buffer.from(`TEST${Math.random()}`)
 
       const res = await all(ipfs.add(input, { cidVersion: 0 }))
 
@@ -64,7 +64,7 @@ module.exports = (common, options) => {
     })
 
     it('should cat a file added as CIDv1 with a CIDv0', async () => {
-      const input = Buffer.from(`TEST${Date.now()}`)
+      const input = Buffer.from(`TEST${Math.random()}`)
 
       const res = await all(ipfs.add(input, { cidVersion: 1, rawLeaves: false }))
 
diff --git a/packages/interface-ipfs-core/src/dag/get.js b/packages/interface-ipfs-core/src/dag/get.js
@@ -138,7 +138,7 @@ module.exports = (common, options) => {
     })
 
     it('should get a node added as CIDv0 with a CIDv1', async () => {
-      const input = Buffer.from(`TEST${Date.now()}`)
+      const input = Buffer.from(`TEST${Math.random()}`)
 
       const node = new DAGNode(input)
 
@@ -152,7 +152,7 @@ module.exports = (common, options) => {
     })
 
     it('should get a node added as CIDv1 with a CIDv0', async () => {
-      const input = Buffer.from(`TEST${Date.now()}`)
+      const input = Buffer.from(`TEST${Math.random()}`)
 
       const res = await all(ipfs.add(input, { cidVersion: 1, rawLeaves: false }))
 
diff --git a/packages/interface-ipfs-core/src/dht/utils.js b/packages/interface-ipfs-core/src/dht/utils.js
@@ -4,7 +4,7 @@ const multihashing = require('multihashing-async')
 const CID = require('cids')
 
 exports.fakeCid = async (data) => {
-  const bytes = data || Buffer.from(`TEST${Date.now()}`)
+  const bytes = data || Buffer.from(`TEST${Math.random()}`)
   const mh = await multihashing(bytes, 'sha2-256')
   return new CID(0, 'dag-pb', mh)
 }
diff --git a/packages/interface-ipfs-core/src/get.js b/packages/interface-ipfs-core/src/get.js
@@ -46,7 +46,7 @@ module.exports = (common, options) => {
     })
 
     it('should get a file added as CIDv0 with a CIDv1', async () => {
-      const input = Buffer.from(`TEST${Date.now()}`)
+      const input = Buffer.from(`TEST${Math.random()}`)
 
       const res = await all(ipfs.add(input, { cidVersion: 0 }))
 
@@ -60,7 +60,7 @@ module.exports = (common, options) => {
     })
 
     it('should get a file added as CIDv1 with a CIDv0', async () => {
-      const input = Buffer.from(`TEST${Date.now()}`)
+      const input = Buffer.from(`TEST${Math.random()}`)
 
       const res = await all(ipfs.add(input, { cidVersion: 1, rawLeaves: false }))
 
diff --git a/packages/ipfs-mfs/test/core/chmod.js b/packages/ipfs-mfs/test/core/chmod.js
@@ -11,8 +11,12 @@ describe('chmod', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   async function testChmod (initialMode, modification, expectedFinalMode) {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
 
     await mfs.write(path, Buffer.from('Hello world'), {
       create: true,
@@ -28,7 +32,7 @@ describe('chmod', () => {
   }
 
   it('should update the mode for a file', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
 
     await mfs.write(path, Buffer.from('Hello world'), {
       create: true,
@@ -45,7 +49,7 @@ describe('chmod', () => {
   })
 
   it('should update the mode for a directory', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
 
     await mfs.mkdir(path)
     const originalMode = (await mfs.stat(path)).mode
@@ -59,7 +63,7 @@ describe('chmod', () => {
   })
 
   it('should update the mode for a hamt-sharded-directory', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
 
     await mfs.mkdir(path)
     await mfs.write(`${path}/foo.txt`, Buffer.from('Hello world'), {
@@ -160,7 +164,7 @@ describe('chmod', () => {
   })
 
   it('should apply special execute permissions to world', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
     const sub = `${path}/sub`
     const file = `${path}/sub/foo.txt`
     const bin = `${path}/sub/bar`
@@ -197,7 +201,7 @@ describe('chmod', () => {
   })
 
   it('should apply special execute permissions to user', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
     const sub = `${path}/sub`
     const file = `${path}/sub/foo.txt`
     const bin = `${path}/sub/bar`
@@ -234,7 +238,7 @@ describe('chmod', () => {
   })
 
   it('should apply special execute permissions to user and group', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
     const sub = `${path}/sub`
     const file = `${path}/sub/foo.txt`
     const bin = `${path}/sub/bar`
@@ -271,7 +275,7 @@ describe('chmod', () => {
   })
 
   it('should apply special execute permissions to sharded directories', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
     const sub = `${path}/sub`
     const file = `${path}/sub/foo.txt`
     const bin = `${path}/sub/bar`
diff --git a/packages/ipfs-mfs/test/core/cp.js b/packages/ipfs-mfs/test/core/cp.js
@@ -20,6 +20,10 @@ describe('cp', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('refuses to copy files without arguments', async () => {
     try {
       await mfs.cp()
diff --git a/packages/ipfs-mfs/test/core/flush.js b/packages/ipfs-mfs/test/core/flush.js
@@ -13,6 +13,10 @@ describe('flush', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('flushes the root node', async () => {
     const cid = await mfs.flush()
 
diff --git a/packages/ipfs-mfs/test/core/ls.js b/packages/ipfs-mfs/test/core/ls.js
@@ -21,6 +21,10 @@ describe('ls', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('lists the root directory by default', async () => {
     const fileName = `small-file-${Math.random()}.txt`
     const content = Buffer.from('Hello world')
@@ -145,8 +149,8 @@ describe('ls', () => {
 
     expect(child.Hash.codec).to.equal('raw')
 
-    const dir = `/dir-with-raw-${Date.now()}`
-    const path = `${dir}/raw-${Date.now()}`
+    const dir = `/dir-with-raw-${Math.random()}`
+    const path = `${dir}/raw-${Math.random()}`
 
     await mfs.mkdir(dir)
     await mfs.cp(`/ipfs/${child.Hash}`, path)
diff --git a/packages/ipfs-mfs/test/core/mkdir.js b/packages/ipfs-mfs/test/core/mkdir.js
@@ -17,6 +17,10 @@ describe('mkdir', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('requires a directory', async () => {
     try {
       await mfs.mkdir('')
diff --git a/packages/ipfs-mfs/test/core/mv.js b/packages/ipfs-mfs/test/core/mv.js
@@ -16,6 +16,10 @@ describe('mv', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('refuses to move files without arguments', async () => {
     try {
       await mfs.mv()
diff --git a/packages/ipfs-mfs/test/core/read.js b/packages/ipfs-mfs/test/core/read.js
@@ -17,6 +17,10 @@ describe('read', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('reads a small file', async () => {
     const filePath = '/small-file.txt'
 
diff --git a/packages/ipfs-mfs/test/core/rm.js b/packages/ipfs-mfs/test/core/rm.js
@@ -19,6 +19,10 @@ describe('rm', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('refuses to remove files without arguments', async () => {
     try {
       await mfs.rm()
diff --git a/packages/ipfs-mfs/test/core/stat.js b/packages/ipfs-mfs/test/core/stat.js
@@ -21,6 +21,10 @@ describe('stat', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('refuses to stat files with an empty path', async () => {
     try {
       await mfs.stat('')
@@ -130,8 +134,8 @@ describe('stat', () => {
 
     expect(child.Hash.codec).to.equal('raw')
 
-    const dir = `/dir-with-raw-${Date.now()}`
-    const path = `${dir}/raw-${Date.now()}`
+    const dir = `/dir-with-raw-${Math.random()}`
+    const path = `${dir}/raw-${Math.random()}`
 
     await mfs.mkdir(dir)
     await mfs.cp(`/ipfs/${child.Hash}`, path)
diff --git a/packages/ipfs-mfs/test/core/touch.js b/packages/ipfs-mfs/test/core/touch.js
@@ -13,8 +13,12 @@ describe('touch', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('should update the mtime for a file', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
 
     await mfs.write(path, Buffer.from('Hello world'), {
       create: true,
@@ -31,7 +35,7 @@ describe('touch', () => {
   })
 
   it('should update the mtime for a directory', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
 
     await mfs.mkdir(path, {
       mtime: new Date()
@@ -47,7 +51,7 @@ describe('touch', () => {
   })
 
   it('should update the mtime for a hamt-sharded-directory', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
 
     await mfs.mkdir(path, {
       mtime: new Date()
@@ -67,7 +71,7 @@ describe('touch', () => {
   })
 
   it('should create an empty file', async () => {
-    const path = `/foo-${Date.now()}`
+    const path = `/foo-${Math.random()}`
 
     await mfs.touch(path, {
       flush: true
diff --git a/packages/ipfs-mfs/test/core/write.js b/packages/ipfs-mfs/test/core/write.js
@@ -62,6 +62,10 @@ describe('write', () => {
     mfs = await createMfs()
   })
 
+  after(async () => {
+    await mfs.repo.close()
+  })
+
   it('explodes if it cannot convert content to a pull stream', async () => {
     try {
       await mfs.write('/foo', -1, {
@@ -827,7 +831,7 @@ describe('write', () => {
   it('results in the same hash as a sharded directory created by the importer when causing a subshard of a subshard to be created', async function () {
     this.timeout(60000)
 
-    const dir = `/some-dir-${Date.now()}`
+    const dir = `/some-dir-${Math.random()}`
 
     const nodeGrContent = Buffer.from([0, 1, 2, 3, 4])
     const superModuleContent = Buffer.from([5, 6, 7, 8, 9])
@@ -876,7 +880,7 @@ describe('write', () => {
   it('adds files that cause sub-sub-shards to be created', async function () {
     // this.timeout(60000)
 
-    const dir = `/updated-dir-${Date.now()}`
+    const dir = `/updated-dir-${Math.random()}`
     const buf = Buffer.from([0, 1, 2, 3, 4])
 
     const dirCid = await createShard(mfs.ipld, [{
@@ -898,7 +902,7 @@ describe('write', () => {
   it('removes files that cause sub-sub-shards to be removed', async function () {
     this.timeout(60000)
 
-    const dir = `/imported-dir-${Date.now()}`
+    const dir = `/imported-dir-${Math.random()}`
     const buf = Buffer.from([0, 1, 2, 3, 4])
 
     const dirCid = await createShard(mfs.ipld, [{
diff --git a/packages/ipfs-mfs/test/helpers/create-mfs.js b/packages/ipfs-mfs/test/helpers/create-mfs.js
diff --git a/packages/ipfs/examples/exchange-files-in-browser/test.js b/packages/ipfs/examples/exchange-files-in-browser/test.js
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
diff --git a/packages/ipfs/test/bootstrapers.js b/packages/ipfs/test/bootstrapers.js
diff --git a/packages/ipfs/test/cli/dag.js b/packages/ipfs/test/cli/dag.js

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ const multihashing = require('multihashing-async')`
`4`	`4`	`const CID = require('cids')`
`5`	`5`
`6`	`6`	`exports.fakeCid = async (data) => {`
`7`		- const bytes = data \|\| Buffer.from(`TEST${Date.now()}`)
	`7`	+ const bytes = data \|\| Buffer.from(`TEST${Math.random()}`)
`8`	`8`	`const mh = await multihashing(bytes, 'sha2-256')`
`9`	`9`	`return new CID(0, 'dag-pb', mh)`
`10`	`10`	`}`