mirror of
https://github.com/orbitdb/orbitdb.git
synced 2025-10-07 22:57:07 +00:00
Use latest orbit-db-store
Also add try/catch to catch assertion errors in replication tests that weren't caught before.
This commit is contained in:
parent
9ee123a93e
commit
60575efc66
@ -24,7 +24,7 @@
|
|||||||
"orbit-db-keystore": "~0.1.0",
|
"orbit-db-keystore": "~0.1.0",
|
||||||
"orbit-db-kvstore": "~1.4.0",
|
"orbit-db-kvstore": "~1.4.0",
|
||||||
"orbit-db-pubsub": "~0.5.5",
|
"orbit-db-pubsub": "~0.5.5",
|
||||||
"orbit-db-store": "~2.5.0"
|
"orbit-db-store": "~2.5.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-core": "^6.26.0",
|
"babel-core": "^6.26.0",
|
||||||
|
@ -300,15 +300,16 @@ Object.keys(testAPIs).forEach(API => {
|
|||||||
db2.events.on('replicated', (address, length) => {
|
db2.events.on('replicated', (address, length) => {
|
||||||
eventCount['replicated'] += length
|
eventCount['replicated'] += length
|
||||||
// console.log("[replicated]", '#' + eventCount['replicated'] + ':', db2.replicationStatus.progress, '/', db2.replicationStatus.max, '| Tasks (in/queued/running/out):', db2._loader.tasksRequested, '/', db2._loader.tasksQueued, '/', db2._loader.tasksRunning, '/', db2._loader.tasksFinished, "|")
|
// console.log("[replicated]", '#' + eventCount['replicated'] + ':', db2.replicationStatus.progress, '/', db2.replicationStatus.max, '| Tasks (in/queued/running/out):', db2._loader.tasksRequested, '/', db2._loader.tasksQueued, '/', db2._loader.tasksRunning, '/', db2._loader.tasksFinished, "|")
|
||||||
assert.equal(db2.replicationStatus.progress, eventCount['replicated'])
|
try {
|
||||||
assert.equal(db2.replicationStatus.max, expectedEventCount)
|
// Test the replicator state
|
||||||
|
assert.equal(db2._loader.tasksRequested >= db2.replicationStatus.progress, true)
|
||||||
// Test the replicator state
|
assert.equal(db2._loader.tasksQueued <= db2.options.referenceCount, true)
|
||||||
assert.equal(db2._loader.tasksRequested >= db2.replicationStatus.progress, true)
|
assert.equal(db2.options.referenceCount, 64)
|
||||||
assert.equal(db2._loader.tasksQueued <= db2.options.referenceCount, true)
|
assert.equal(db2._loader.tasksRunning, 0)
|
||||||
assert.equal(db2.options.referenceCount, 64)
|
assert.equal(db2._loader.tasksFinished, db2.replicationStatus.progress)
|
||||||
assert.equal(db2._loader.tasksRunning, 0)
|
} catch (e) {
|
||||||
assert.equal(db2._loader.tasksFinished, db2.replicationStatus.progress)
|
reject(e)
|
||||||
|
}
|
||||||
|
|
||||||
events.push({
|
events.push({
|
||||||
event: 'replicated',
|
event: 'replicated',
|
||||||
@ -428,7 +429,12 @@ Object.keys(testAPIs).forEach(API => {
|
|||||||
eventCount['replicated'] += length
|
eventCount['replicated'] += length
|
||||||
const values = db2.iterator({limit: -1}).collect()
|
const values = db2.iterator({limit: -1}).collect()
|
||||||
// console.log("[replicated]", '#' + eventCount['replicated'] + ':', current, '/', total, '| Tasks (in/queued/running/out):', db2._loader.tasksRequested, '/', db2._loader.tasksQueued, '/', db2._loader.tasksRunning, '/', db2._loader.tasksFinished, "|", db2._loader._stats.a, db2._loader._stats.b, db2._loader._stats.c, db2._loader._stats.d)
|
// console.log("[replicated]", '#' + eventCount['replicated'] + ':', current, '/', total, '| Tasks (in/queued/running/out):', db2._loader.tasksRequested, '/', db2._loader.tasksQueued, '/', db2._loader.tasksRunning, '/', db2._loader.tasksFinished, "|", db2._loader._stats.a, db2._loader._stats.b, db2._loader._stats.c, db2._loader._stats.d)
|
||||||
assert.equal(db2.replicationStatus.progress <= db2.replicationStatus.max, true)
|
try {
|
||||||
|
assert.equal(db2.replicationStatus.progress <= db2.replicationStatus.max, true)
|
||||||
|
} catch (e) {
|
||||||
|
reject(e)
|
||||||
|
}
|
||||||
|
|
||||||
events.push({
|
events.push({
|
||||||
event: 'replicated',
|
event: 'replicated',
|
||||||
count: eventCount['replicate'],
|
count: eventCount['replicate'],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user