Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(jest-changed-files): improve changedFilesWithAncestor command pattern for Mercurial SCM #12322

Merged
merged 15 commits into from
Apr 21, 2022
Merged

fix(jest-changed-files): improve changedFilesWithAncestor command pattern for Mercurial SCM #12322

Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d4a5679
disable flaky mercurial test
mrazauskas Feb 7, 2022
7af601b
add jest.retryTimes
mrazauskas Feb 7, 2022
7f06a80
skip one test
mrazauskas Feb 7, 2022
879a8a5
exclude failing part
mrazauskas Feb 7, 2022
979530b
Merge branch 'main' into ci-disable-mercurial-test
mrazauskas Feb 8, 2022
e714e6e
fix revset
mrazauskas Feb 8, 2022
72ba692
uncomment test
mrazauskas Feb 8, 2022
2140f7d
with first
mrazauskas Feb 8, 2022
2b175e4
increase timeout?
mrazauskas Feb 8, 2022
b4ccbe2
revert timeout
mrazauskas Feb 8, 2022
cce3072
Merge branch 'main' into ci-disable-mercurial-test
mrazauskas Feb 8, 2022
79ad644
pattern style
mrazauskas Feb 8, 2022
c1fbe7b
add changelog entry
mrazauskas Feb 8, 2022
3f43c84
prettier
mrazauskas Feb 8, 2022
01c8206
Merge branch 'main' into ci-disable-mercurial-test
SimenB Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions e2e/__tests__/jestChangedFiles.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ function gitCreateBranch(branchName: string, dir: string) {
run(`git branch ${branchName}`, dir);
}

jest.retryTimes(3);

beforeEach(() => cleanup(DIR));
afterEach(() => cleanup(DIR));

Expand Down Expand Up @@ -466,13 +468,6 @@ testIfHg('gets changed files for hg', async () => {
});

testIfHg('monitors only root paths for hg', async () => {
if (process.env.CI) {
// Circle and Travis have very old version of hg (v2, and current
// version is v4.2) and its API changed since then and not compatible
// any more. Changing the SCM version on CIs is not trivial, so we'll just
// skip this test and run it only locally.
return;
}
writeFiles(DIR, {
'file1.txt': 'file1',
'nested-dir/file2.txt': 'file2',
Expand Down