Fix tests

This commit is contained in:
haad 2016-05-30 15:56:52 +02:00
parent 05fecda43f
commit 52e7dca6e3
2 changed files with 30 additions and 24 deletions

View File

@ -15,6 +15,7 @@ const OrbitServer = require('orbit-server/src/server');
require('logplease').setLogLevel('ERROR'); require('logplease').setLogLevel('ERROR');
// Orbit // Orbit
// const network = 'QmRB8x6aErtKTFHDNRiViixSKYwW1DbfcvJHaZy1hnRzLM';
const network = 'Qmeh6ktQ1YFKksugJb59vBxG51xXoEvjBZXRK3DdrF3mNj'; const network = 'Qmeh6ktQ1YFKksugJb59vBxG51xXoEvjBZXRK3DdrF3mNj';
const username = 'testrunner'; const username = 'testrunner';
const password = ''; const password = '';

View File

@ -43,17 +43,16 @@ const IpfsApis = [
// resolve(ipfs); // resolve(ipfs);
return init().then(() => { return init().then(() => {
resolve(ipfs); // resolve(ipfs);
// ipfs.goOnline((err) => { ipfs.goOnline((err) => {
// console.log("ava") if(err) reject(err)
// if(err) reject(err) return resolve(ipfs)
// return resolve(ipfs) });
// });
}); });
}); });
}, },
stop: () => Promise.resolve() // stop: () => Promise.resolve()
// stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve)) stop: () => new Promise((resolve, reject) => ipfs.goOffline(resolve))
}, },
{ {
// js-ipfs-api via local daemon // js-ipfs-api via local daemon
@ -61,7 +60,7 @@ const IpfsApis = [
start: () => { start: () => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
ipfsd.disposableApi((err, ipfs) => { ipfsd.disposableApi((err, ipfs) => {
if(err) console.error(err); if(err) reject(err);
resolve(ipfs); resolve(ipfs);
}); });
// ipfsd.local((err, node) => { // ipfsd.local((err, node) => {
@ -147,25 +146,31 @@ IpfsApis.forEach(function(ipfsApi) {
it('syncs counters', (done) => { it('syncs counters', (done) => {
const name = new Date().getTime(); const name = new Date().getTime();
Promise.all([client1.counter(name), client2.counter(name)]).then((counters) => { Promise.map([client1, client2], (client) => client.counter(name), { concurrency: 1})
const res1 = Promise.map([13, 10], (f) => counters[0].inc(f), { concurrency: 1 }); .then((counters) => {
const res2 = Promise.map([2, 5], (f) => counters[1].inc(f), { concurrency: 1 }) const res1 = Promise.map([13, 10], (f) => counters[0].inc(f), { concurrency: 1 });
Promise.all([res1, res2]).then((res) => { const res2 = Promise.map([2, 5], (f) => counters[1].inc(f), { concurrency: 1 })
setTimeout(() => { Promise.all([res1, res2])
assert.equal(counters[0].value(), 30); .then((res) => {
assert.equal(counters[1].value(), 30); setTimeout(() => {
done(); assert.equal(counters[0].value(), 30);
}, 2000) assert.equal(counters[1].value(), 30);
}).catch((e) => { done();
}, 5000)
})
.catch((e) => {
console.log(e);
console.log(e.stack);
assert(e);
done();
});
})
.catch((e) => {
console.log(e); console.log(e);
console.log(e.stack);
assert(e); assert(e);
done(); done();
}); });
}).catch((e) => {
console.log(e);
assert(e);
done();
});
}); });
}); });