specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Work around flaky test

Browse source
This commit is contained in:
Calvin Montgomery 2022-09-21 22:21:16 -07:00
parent 5985c8d280
commit c686100008
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
integration_test/channel/kickban.js
View file

@ -362,7 +362,6 @@ describe('KickbanModule', () => {
); );
}); });
// TODO: for whatever reason, this test is flaky
it('inserts a valid IPv6 ban', done => { it('inserts a valid IPv6 ban', done => {
const longIP = require('../../lib/utilities').expandIPv6('::abcd'); const longIP = require('../../lib/utilities').expandIPv6('::abcd');

7
src/channel/kickban.js
View file

@ -404,7 +404,12 @@ KickBanModule.prototype.banAll = async function banAll(
); );
if (!await dbIsNameBanned(chan.name, name)) { if (!await dbIsNameBanned(chan.name, name)) {
promises.push(this.banName(actor, name, reason)); promises.push(this.banName(actor, name, reason).catch(error => {
// TODO: banning should be made idempotent, not throw an error
if (!/already banned/.test(error.message)) {
throw error;
}
}));
} }
await Promise.all(promises); await Promise.all(promises);