Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-02 00:07:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some flaky test-electron tests

Browse Source 
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
This commit is contained in:
automated-signal
2026-03-27 12:58:12 -05:00
committed by GitHub
parent 7b0d169629
commit 355d304917
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ts/test-electron/cleanupOrphanedAttachments_test.preload.ts
View File

@@ -19,6 +19,7 @@ import {
getDownloadsPath,
getDraftPath,
getAttachmentsPath,
getMegaphonesPath,
} from '../windows/main/attachments.preload.js';
import { generateAci } from '../types/ServiceId.std.js';
@@ -75,6 +76,7 @@ describe('cleanupOrphanedAttachments', () => {
);
await emptyDir(getDownloadsPath(window.SignalContext.config.userDataPath));
await emptyDir(getDraftPath(window.SignalContext.config.userDataPath));
await emptyDir(getMegaphonesPath(window.SignalContext.config.userDataPath));
});
afterEach(async () => {
@@ -83,6 +85,7 @@ describe('cleanupOrphanedAttachments', () => {
);
await emptyDir(getDownloadsPath(window.SignalContext.config.userDataPath));
await emptyDir(getDraftPath(window.SignalContext.config.userDataPath));
await emptyDir(getMegaphonesPath(window.SignalContext.config.userDataPath));
});
function getAttachmentFilePath() {

30
ts/test-electron/services/AttachmentBackupManager_test.preload.ts
View File

@@ -244,12 +244,18 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
const jobs = await addJobs(5);
const thumbnailJobs = await addThumbnailJobs(5);
const job0Started = waitForJobToBeStarted(assertAt(jobs, 0));
const job2Started = waitForJobToBeStarted(assertAt(jobs, 2));
const job0ThumbnailCompleted = waitForJobToBeCompleted(
assertAt(thumbnailJobs, 0)
);
// Confirm they are saved to DB
const allJobs = await getAllSavedJobs();
assert.strictEqual(allJobs.length, 10, 'initial setup');
await backupManager?.start();
await waitForJobToBeStarted(assertAt(jobs, 2));
await job2Started;
assert.strictEqual(runJob.callCount, 3);
assertRunJobCalledWith([
@@ -258,7 +264,7 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
assertAt(jobs, 2),
]);
await waitForJobToBeStarted(assertAt(jobs, 0));
await job0Started;
assert.strictEqual(runJob.callCount, 5, 'first calls');
assertRunJobCalledWith([
assertAt(jobs, 4),
@@ -268,7 +274,7 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
assertAt(jobs, 0),
]);
await waitForJobToBeCompleted(assertAt(thumbnailJobs, 0));
await job0ThumbnailCompleted;
assert.strictEqual(runJob.callCount, 10, 'all calls');
assertRunJobCalledWith([
@@ -288,8 +294,9 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
it('with transitCdnInfo, will copy to backup tier', async () => {
const jobs = await addJobs(1);
const jobCompleted = waitForJobToBeCompleted(assertAt(jobs, 0));
await backupManager?.start();
await waitForJobToBeCompleted(assertAt(jobs, 0));
await jobCompleted;
assert.strictEqual(backupMediaBatch.callCount, 1);
assert.strictEqual(encryptAndUploadAttachment.callCount, 0);
@@ -315,8 +322,9 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
);
const jobs = await addJobs(1);
const jobCompleted = waitForJobToBeCompleted(assertAt(jobs, 0));
await backupManager?.start();
await waitForJobToBeCompleted(assertAt(jobs, 0));
await jobCompleted;
assert.strictEqual(encryptAndUploadAttachment.callCount, 1);
assert.strictEqual(backupMediaBatch.callCount, 2);
@@ -335,9 +343,10 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
it('without transitCdnInfo, will upload then copy', async () => {
const jobs = await addJobs(1, { transitCdnInfo: undefined });
const jobCompleted = waitForJobToBeCompleted(assertAt(jobs, 0));
await backupManager?.start();
await waitForJobToBeCompleted(assertAt(jobs, 0));
await jobCompleted;
assert.strictEqual(backupMediaBatch.callCount, 1);
assert.strictEqual(encryptAndUploadAttachment.callCount, 1);
@@ -352,9 +361,10 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
transitCdnInfo: undefined,
path: 'nothing/here',
});
const jobCompleted = waitForJobToBeCompleted(assertAt(jobs, 0));
await backupManager?.start();
await waitForJobToBeCompleted(assertAt(jobs, 0));
await jobCompleted;
assert.strictEqual(backupMediaBatch.callCount, 0);
assert.strictEqual(encryptAndUploadAttachment.callCount, 0);
@@ -366,6 +376,8 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
it('pauses if it receives a retryAfter', async () => {
const jobs = await addJobs(5, { transitCdnInfo: undefined });
const job0Started = waitForJobToBeStarted(assertAt(jobs, 0));
const job2Started = waitForJobToBeStarted(assertAt(jobs, 2));
encryptAndUploadAttachment.throws(
new HTTPError('Rate limited', {
@@ -374,7 +386,7 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
})
);
await backupManager?.start();
await waitForJobToBeStarted(assertAt(jobs, 2));
await job2Started;
assert.strictEqual(runJob.callCount, 3);
assertRunJobCalledWith([
@@ -393,7 +405,7 @@ describe('AttachmentBackupManager/JobManager', function attachmentBackupManager(
});
await clock.tickAsync(100000);
await waitForJobToBeStarted(assertAt(jobs, 0));
await job0Started;
assert.strictEqual(runJob.callCount, 8);
assertRunJobCalledWith([
assertAt(jobs, 4),