web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

diagnose some unhandled errors in rpc tests

Browse Source
This commit is contained in:
ansuz 2020-03-09 18:18:26 -04:00
parent 461c809e4f
commit b9a07ca650
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/tests/test-rpc.js
View File

@ -376,7 +376,7 @@ nThen(function (w) {
alice.anonRpc.send('GET_METADATA', oscar.mailboxChannel, w(function (err, response) { alice.anonRpc.send('GET_METADATA', oscar.mailboxChannel, w(function (err, response) {
if (!response) { throw new Error("EXPECTED RESPONSE"); } if (!response) { throw new Error("EXPECTED RESPONSE"); }
var metadata = response[0]; var metadata = response[0];
var expected_fields = ['restricted', 'allowed']; var expected_fields = ['restricted', 'allowed', 'rejected'];
for (var key in metadata) { for (var key in metadata) {
if (expected_fields.indexOf(key) === -1) { if (expected_fields.indexOf(key) === -1) {
console.log(metadata); console.log(metadata);
@ -655,7 +655,7 @@ nThen(function (w) {
console.error("checkpoint by member failed as expected"); console.error("checkpoint by member failed as expected");
})); }));
}).nThen(function (w) { }).nThen(function (w) {
console.log("STATE =", JSON.stringify(oscar.roster.getState(), null, 2)); //console.log("STATE =", JSON.stringify(oscar.roster.getState(), null, 2));
// oscar describes the team // oscar describes the team
oscar.roster.metadata({ oscar.roster.metadata({
@ -663,7 +663,7 @@ nThen(function (w) {
topic: "pewpewpew", topic: "pewpewpew",
}, w(function (err) { }, w(function (err) {
if (err) { return void console.log(err); } if (err) { return void console.log(err); }
console.log("STATE =", JSON.stringify(oscar.roster.getState(), null, 2)); //console.log("STATE =", JSON.stringify(oscar.roster.getState(), null, 2));
})); }));
}).nThen(function (w) { }).nThen(function (w) {
// oscar sends a checkpoint // oscar sends a checkpoint
@ -718,10 +718,12 @@ nThen(function (w) {
})); }));
}).nThen(function (w) { }).nThen(function (w) {
oscar.roster.checkpoint(w(function (err) { oscar.roster.checkpoint(w(function (err) {
var hash = oscar.lastRosterCheckpointHash = oscar.roster.getLastCheckpointHash(); // FIXME bob should connect to this to avoid extra messages
if (!err) { return; } if (!err) { return; }
console.error("Checkpoint by an owner failed unexpectedly"); console.error("Checkpoint by an owner failed unexpectedly");
console.error(err); console.error(err);
process.exit(1); process.exit(1);
})); }));
}).nThen(function (w) { }).nThen(function (w) {
alice.roster.remove([ alice.roster.remove([
@ -742,21 +744,21 @@ nThen(function (w) {
channel: rosterKeys.channel, channel: rosterKeys.channel,
keys: rosterKeys, keys: rosterKeys,
anon_rpc: bob.anonRpc, anon_rpc: bob.anonRpc,
lastKnownHash: oscar.lastKnownHash, //lastKnownHash: oscar.lastRosterCheckpointHash
//lastKnownHash: oscar.lastKnownHash, // FIXME this doesn't work. off-by-one?
}, w(function (err, roster) { }, w(function (err, roster) {
if (err) { if (err) {
w.abort(); w.abort();
return void console.trace(err); return void console.trace(err);
} }
bob.roster = roster; bob.roster = roster;
if (JSON.stringify(bob.roster.getState()) !== JSON.stringify(oscar.roster.getState())) { if (JSON.stringify(bob.roster.getState()) !== JSON.stringify(oscar.roster.getState())) {
console.log("BOB AND OSCAR DO NOT HAVE THE SAME STATE"); //console.log("BOB AND OSCAR DO NOT HAVE THE SAME STATE");
console.log("BOB =", JSON.stringify(bob.roster.getState(), null, 2)); console.log("BOB =", JSON.stringify(bob.roster.getState(), null, 2));
console.log("OSCAR =", JSON.stringify(oscar.roster.getState(), null, 2)); console.log("OSCAR =", JSON.stringify(oscar.roster.getState(), null, 2));
throw new Error("BOB AND OSCAR DO NOT HAVE THE SAME STATE");
} }
bob.destroy.reg(function () { bob.destroy.reg(function () {
roster.stop(); roster.stop();
}); });
@ -803,8 +805,8 @@ nThen(function (w) {
bob.roster.describe(data, w(function (err) { bob.roster.describe(data, w(function (err) {
if (err) { if (err) {
console.error("self-description by a member failed unexpectedly"); console.error(err);
process.exit(1); throw new Error("self-description by a member failed unexpectedly");
} }
})); }));
}).nThen(function (w) { }).nThen(function (w) {