Skip to content
This repository was archived by the owner on Sep 30, 2023. It is now read-only.

Commit e18a652

Browse files
tabcataphelionz
tabcat
authored and
aphelionz
committed
tests use tmp ipfs repo
1 parent b8e4b76 commit e18a652

12 files changed

+12
-72
lines changed

‎test/entry-io.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,10 @@ Object.keys(testAPIs).forEach((IPFS) => {
2525
this.timeout(config.timeout)
2626

2727
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
28-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
29-
repo: config.defaultIpfsConfig.repo + '-entry-io' + new Date().getTime()
30-
})
3128

3229
let options, keystore, signingKeystore
3330

3431
before(async () => {
35-
rmrf.sync(ipfsConfig.repo)
3632
rmrf.sync(identityKeysPath)
3733
rmrf.sync(signingKeysPath)
3834
await fs.copy(identityKeyFixtures, identityKeysPath)
@@ -51,13 +47,12 @@ Object.keys(testAPIs).forEach((IPFS) => {
5147
testIdentity2 = await IdentityProvider.createIdentity(options[1])
5248
testIdentity3 = await IdentityProvider.createIdentity(options[2])
5349
testIdentity4 = await IdentityProvider.createIdentity(options[3])
54-
ipfsd = await startIpfs(IPFS, ipfsConfig)
50+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
5551
ipfs = ipfsd.api
5652
})
5753

5854
after(async () => {
5955
await stopIpfs(ipfsd)
60-
rmrf.sync(ipfsConfig.repo)
6156
rmrf.sync(identityKeysPath)
6257
rmrf.sync(signingKeysPath)
6358

‎test/entry.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,18 @@ Object.keys(testAPIs).forEach((IPFS) => {
2828

2929
const testACL = new AccessController()
3030
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
31-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
32-
repo: config.defaultIpfsConfig.repo + '-entry' + new Date().getTime()
33-
})
3431

3532
let keystore, signingKeystore
3633

3734
before(async () => {
38-
rmrf.sync(ipfsConfig.repo)
3935
await fs.copy(identityKeyFixtures, identityKeysPath)
4036
await fs.copy(signingKeyFixtures, signingKeysPath)
4137

4238
keystore = new Keystore(identityKeysPath)
4339
signingKeystore = new Keystore(signingKeysPath)
4440

4541
testIdentity = await IdentityProvider.createIdentity({ id: 'userA', keystore, signingKeystore })
46-
ipfsd = await startIpfs(IPFS, ipfsConfig)
42+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
4743
ipfs = ipfsd.api
4844
})
4945

@@ -53,7 +49,6 @@ Object.keys(testAPIs).forEach((IPFS) => {
5349
await fs.copy(signingKeyFixtures, signingKeysPath)
5450
rmrf.sync(identityKeysPath)
5551
rmrf.sync(signingKeysPath)
56-
rmrf.sync(ipfsConfig.repo)
5752
await keystore.close()
5853
await signingKeystore.close()
5954
})

‎test/log-append.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,10 @@ Object.keys(testAPIs).forEach((IPFS) => {
2222
this.timeout(config.timeout)
2323

2424
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
25-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
26-
repo: config.defaultIpfsConfig.repo + '-log-append' + new Date().getTime()
27-
})
2825

2926
let keystore, signingKeystore
3027

3128
before(async () => {
32-
rmrf.sync(ipfsConfig.repo)
3329
rmrf.sync(identityKeysPath)
3430
rmrf.sync(signingKeysPath)
3531
await fs.copy(identityKeyFixtures, identityKeysPath)
@@ -39,13 +35,12 @@ Object.keys(testAPIs).forEach((IPFS) => {
3935
signingKeystore = new Keystore(signingKeysPath)
4036

4137
testIdentity = await IdentityProvider.createIdentity({ id: 'userA', keystore, signingKeystore })
42-
ipfsd = await startIpfs(IPFS, ipfsConfig)
38+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
4339
ipfs = ipfsd.api
4440
})
4541

4642
after(async () => {
4743
await stopIpfs(ipfsd)
48-
rmrf.sync(ipfsConfig.repo)
4944
rmrf.sync(identityKeysPath)
5045
rmrf.sync(signingKeysPath)
5146

‎test/log-crdt.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,10 @@ Object.keys(testAPIs).forEach((IPFS) => {
2222
this.timeout(config.timeout)
2323

2424
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
25-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
26-
repo: config.defaultIpfsConfig.repo + '-log-crdt' + new Date().getTime()
27-
})
2825

2926
let keystore, signingKeystore
3027

3128
before(async () => {
32-
rmrf.sync(ipfsConfig.repo)
3329
rmrf.sync(identityKeysPath)
3430
rmrf.sync(signingKeysPath)
3531
await fs.copy(identityKeyFixtures, identityKeysPath)
@@ -41,13 +37,12 @@ Object.keys(testAPIs).forEach((IPFS) => {
4137
testIdentity = await IdentityProvider.createIdentity({ id: 'userA', keystore, signingKeystore })
4238
testIdentity2 = await IdentityProvider.createIdentity({ id: 'userB', keystore, signingKeystore })
4339
testIdentity3 = await IdentityProvider.createIdentity({ id: 'userC', keystore, signingKeystore })
44-
ipfsd = await startIpfs(IPFS, ipfsConfig)
40+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
4541
ipfs = ipfsd.api
4642
})
4743

4844
after(async () => {
4945
await stopIpfs(ipfsd)
50-
rmrf.sync(ipfsConfig.repo)
5146
rmrf.sync(identityKeysPath)
5247
rmrf.sync(signingKeysPath)
5348

‎test/log-heads-tails.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,10 @@ Object.keys(testAPIs).forEach((IPFS) => {
2727
this.timeout(config.timeout)
2828

2929
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
30-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
31-
repo: config.defaultIpfsConfig.repo + '-log-head-and-tails' + new Date().getTime()
32-
})
3330

3431
let keystore, signingKeystore
3532

3633
before(async () => {
37-
rmrf.sync(ipfsConfig.repo)
3834
rmrf.sync(identityKeysPath)
3935
rmrf.sync(signingKeysPath)
4036
await fs.copy(identityKeyFixtures, identityKeysPath)
@@ -47,13 +43,12 @@ Object.keys(testAPIs).forEach((IPFS) => {
4743
testIdentity2 = await IdentityProvider.createIdentity({ id: 'userB', keystore, signingKeystore })
4844
testIdentity3 = await IdentityProvider.createIdentity({ id: 'userC', keystore, signingKeystore })
4945
testIdentity4 = await IdentityProvider.createIdentity({ id: 'userD', keystore, signingKeystore })
50-
ipfsd = await startIpfs(IPFS, ipfsConfig)
46+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
5147
ipfs = ipfsd.api
5248
})
5349

5450
after(async () => {
5551
await stopIpfs(ipfsd)
56-
rmrf.sync(ipfsConfig.repo)
5752
rmrf.sync(identityKeysPath)
5853
rmrf.sync(signingKeysPath)
5954

‎test/log-iterator.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,10 @@ Object.keys(testAPIs).forEach((IPFS) => {
2323
this.timeout(config.timeout)
2424

2525
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
26-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
27-
repo: config.defaultIpfsConfig.repo + '-log-join' + new Date().getTime()
28-
})
2926

3027
let keystore, signingKeystore
3128

3229
before(async () => {
33-
rmrf.sync(ipfsConfig.repo)
3430
rmrf.sync(identityKeysPath)
3531
rmrf.sync(signingKeysPath)
3632
await fs.copy(identityKeyFixtures, identityKeysPath)
@@ -42,13 +38,12 @@ Object.keys(testAPIs).forEach((IPFS) => {
4238
testIdentity = await IdentityProvider.createIdentity({ id: 'userA', keystore, signingKeystore })
4339
testIdentity2 = await IdentityProvider.createIdentity({ id: 'userB', keystore, signingKeystore })
4440
testIdentity3 = await IdentityProvider.createIdentity({ id: 'userC', keystore, signingKeystore })
45-
ipfsd = await startIpfs(IPFS, ipfsConfig)
41+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
4642
ipfs = ipfsd.api
4743
})
4844

4945
after(async () => {
5046
await stopIpfs(ipfsd)
51-
rmrf.sync(ipfsConfig.repo)
5247
rmrf.sync(identityKeysPath)
5348
rmrf.sync(signingKeysPath)
5449

‎test/log-join-concurrent.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,21 @@ Object.keys(testAPIs).forEach(IPFS => {
2121
this.timeout(config.timeout)
2222

2323
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
24-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
25-
repo: config.defaultIpfsConfig.repo + '-log-join-concurrent' + new Date().getTime()
26-
})
2724

2825
before(async () => {
29-
rmrf.sync(ipfsConfig.repo)
3026
rmrf.sync(identityKeysPath)
3127
rmrf.sync(signingKeysPath)
3228
await fs.copy(identityKeyFixtures, identityKeysPath)
3329
await fs.copy(signingKeyFixtures, signingKeysPath)
3430
testIdentity = await IdentityProvider.createIdentity({ id: 'userA', identityKeysPath, signingKeysPath })
35-
ipfsd = await startIpfs(IPFS, ipfsConfig)
31+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
3632
ipfs = ipfsd.api
3733
})
3834

3935
after(async () => {
4036
await stopIpfs(ipfsd)
4137
await testIdentity.provider.keystore.close()
4238
await testIdentity.provider.signingKeystore.close()
43-
rmrf.sync(ipfsConfig.repo)
4439
rmrf.sync(identityKeysPath)
4540
rmrf.sync(signingKeysPath)
4641
})

‎test/log-join.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,10 @@ Object.keys(testAPIs).forEach((IPFS) => {
2828
this.timeout(config.timeout)
2929

3030
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
31-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
32-
repo: config.defaultIpfsConfig.repo + '-log-join' + new Date().getTime()
33-
})
3431

3532
let keystore, signingKeystore
3633

3734
before(async () => {
38-
rmrf.sync(ipfsConfig.repo)
3935
rmrf.sync(identityKeysPath)
4036
rmrf.sync(signingKeysPath)
4137
await fs.copy(identityKeyFixtures, identityKeysPath)
@@ -49,13 +45,12 @@ Object.keys(testAPIs).forEach((IPFS) => {
4945
testIdentity3 = await IdentityProvider.createIdentity({ id: 'userD', keystore, signingKeystore })
5046
testIdentity4 = await IdentityProvider.createIdentity({ id: 'userA', keystore, signingKeystore })
5147

52-
ipfsd = await startIpfs(IPFS, ipfsConfig)
48+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
5349
ipfs = ipfsd.api
5450
})
5551

5652
after(async () => {
5753
await stopIpfs(ipfsd)
58-
rmrf.sync(ipfsConfig.repo)
5954
rmrf.sync(identityKeysPath)
6055
rmrf.sync(signingKeysPath)
6156

‎test/log-load.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ Object.keys(testAPIs).forEach((IPFS) => {
3838
this.timeout(config.timeout)
3939

4040
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
41-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
42-
repo: config.defaultIpfsConfig.repo + '-log-load' + new Date().getTime()
43-
})
4441

4542
const firstWriteExpectedData = [
4643
'entryA6', 'entryA7', 'entryA8', 'entryA9',
@@ -52,7 +49,6 @@ Object.keys(testAPIs).forEach((IPFS) => {
5249
let keystore, signingKeystore
5350

5451
before(async () => {
55-
rmrf.sync(ipfsConfig.repo)
5652
rmrf.sync(identityKeysPath)
5753
rmrf.sync(signingKeysPath)
5854
await fs.copy(identityKeyFixtures, identityKeysPath)
@@ -65,7 +61,7 @@ Object.keys(testAPIs).forEach((IPFS) => {
6561
testIdentity2 = await IdentityProvider.createIdentity({ id: 'userB', keystore, signingKeystore })
6662
testIdentity3 = await IdentityProvider.createIdentity({ id: 'userD', keystore, signingKeystore })
6763
testIdentity4 = await IdentityProvider.createIdentity({ id: 'userA', keystore, signingKeystore })
68-
ipfsd = await startIpfs(IPFS, ipfsConfig)
64+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
6965
ipfs = ipfsd.api
7066

7167
const memstore = new MemStore()
@@ -75,7 +71,6 @@ Object.keys(testAPIs).forEach((IPFS) => {
7571

7672
after(async () => {
7773
await stopIpfs(ipfsd)
78-
rmrf.sync(ipfsConfig.repo)
7974
rmrf.sync(identityKeysPath)
8075
rmrf.sync(signingKeysPath)
8176

‎test/log-references.spec.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,10 @@ Object.keys(testAPIs).forEach((IPFS) => {
2222
this.timeout(config.timeout)
2323

2424
const { identityKeyFixtures, signingKeyFixtures, identityKeysPath, signingKeysPath } = config
25-
const ipfsConfig = Object.assign({}, config.defaultIpfsConfig, {
26-
repo: config.defaultIpfsConfig.repo + '-log-refs' + new Date().getTime()
27-
})
2825

2926
let keystore, signingKeystore
3027

3128
before(async () => {
32-
rmrf.sync(ipfsConfig.repo)
3329
rmrf.sync(identityKeysPath)
3430
rmrf.sync(signingKeysPath)
3531
await fs.copy(identityKeyFixtures, identityKeysPath)
@@ -39,13 +35,12 @@ Object.keys(testAPIs).forEach((IPFS) => {
3935
signingKeystore = new Keystore(signingKeysPath)
4036

4137
testIdentity = await IdentityProvider.createIdentity({ id: 'userA', keystore, signingKeystore })
42-
ipfsd = await startIpfs(IPFS, ipfsConfig)
38+
ipfsd = await startIpfs(IPFS, config.defaultIpfsConfig)
4339
ipfs = ipfsd.api
4440
})
4541

4642
after(async () => {
4743
await stopIpfs(ipfsd)
48-
rmrf.sync(ipfsConfig.repo)
4944
rmrf.sync(identityKeysPath)
5045
rmrf.sync(signingKeysPath)
5146

0 commit comments

Comments
 (0)