Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit d21d382

Browse files
authored
Merge pull request #1765 from atom/aw/flag-flakes
Retry known test flakes
2 parents 32c39c2 + 4826e20 commit d21d382

File tree

5 files changed

+14
-0
lines changed

5 files changed

+14
-0
lines changed

test/git-strategies.test.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,6 +1457,8 @@ import * as reporterProxy from '../lib/reporter-proxy';
14571457
}
14581458

14591459
it('prompts for authentication data through Atom', async function() {
1460+
this.retries(5); // FLAKE
1461+
14601462
let query = null;
14611463
const git = await withHttpRemote({
14621464
prompt: q => {
@@ -1516,6 +1518,8 @@ import * as reporterProxy from '../lib/reporter-proxy';
15161518
});
15171519

15181520
it('prefers user-configured credential helpers if present', async function() {
1521+
this.retries(5); // FLAKE
1522+
15191523
let query = null;
15201524
const git = await withHttpRemote({
15211525
prompt: q => {

test/github-package.test.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,8 @@ describe('GithubPackage', function() {
608608
let workdirPath2, atomGitRepository2, repository2;
609609

610610
beforeEach(async function() {
611+
this.retries(5); // FLAKE
612+
611613
[workdirPath1, workdirPath2] = await Promise.all([
612614
cloneRepository('three-files'),
613615
cloneRepository('three-files'),
@@ -645,6 +647,7 @@ describe('GithubPackage', function() {
645647
if (process.platform === 'linux') {
646648
this.skip();
647649
}
650+
this.retries(5); // FLAKE
648651

649652
fs.writeFileSync(path.join(workdirPath1, 'a.txt'), 'some changes', 'utf8');
650653

@@ -656,6 +659,7 @@ describe('GithubPackage', function() {
656659
if (process.platform === 'linux') {
657660
this.skip();
658661
}
662+
this.retries(5); // FLAKE
659663

660664
fs.writeFileSync(path.join(workdirPath2, 'b.txt'), 'other changes', 'utf8');
661665

test/integration/file-patch.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,8 @@ describe('integration: file patches', function() {
732732
});
733733

734734
it('may be partially staged', async function() {
735+
this.retries(5); // FLAKE
736+
735737
getPatchEditor('unstaged', 'sample.js').setSelectedBufferRanges([
736738
[[2, 0], [2, 0]],
737739
[[10, 0], [10, 0]],

test/models/file-system-change-observer.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ describe('FileSystemChangeObserver', function() {
2525
});
2626

2727
it('emits an event when a project file is modified, created, or deleted', async function() {
28+
this.retries(5); // FLAKE
29+
2830
const workdirPath = await cloneRepository('three-files');
2931
const repository = await buildRepository(workdirPath);
3032
observer = createObserver(repository);

test/worker-manager.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ describe('WorkerManager', function() {
149149

150150
describe('when the manager process is destroyed', function() {
151151
it('destroys all the renderer processes that were created', async function() {
152+
this.retries(5); // FLAKE
153+
152154
const browserWindow = new BrowserWindow({show: !!process.env.ATOM_GITHUB_SHOW_RENDERER_WINDOW});
153155
browserWindow.loadURL('about:blank');
154156
sinon.stub(Worker.prototype, 'getWebContentsId').returns(browserWindow.webContents.id);

0 commit comments

Comments
 (0)