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.

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

4.x ci improve #6853

Merged
merged 8 commits into from
Aug 14, 2018
Merged

4.x ci improve #6853

merged 8 commits into from
Aug 14, 2018

Conversation

Fonger
Copy link
Contributor

@Fonger Fonger commented Aug 13, 2018

Summary

cherry-pick some fix of flaky tests from master while maintaining compatibility with legacy Node.js 0.10

also manually fix 2 additional flaky tests specific to 4.x

@Fonger Fonger force-pushed the 4.x-ci-improve branch 3 times, most recently from f689832 to 06b64df Compare August 13, 2018 23:31
assert.ifError(error);
done();
});
MyModel.on('index', function(err) {
Copy link
Contributor Author

@Fonger Fonger Aug 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should have used init() here but this is cherry-pick from master branch

There're many other test cases using on('index') so this should be done in a future fix in master

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's fair, we'll do that later. For now, I don't want to put more effort into 4.x than is necessary. We'll make the changes in master when it is convenient.

assert.ifError(error);
done();
});
MyModel.on('index', function(err) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's fair, we'll do that later. For now, I don't want to put more effort into 4.x than is necessary. We'll make the changes in master when it is convenient.

@vkarpov15 vkarpov15 merged commit 0e8f016 into Automattic:4.x Aug 14, 2018
@Fonger Fonger deleted the 4.x-ci-improve branch August 16, 2018 10:25
@Fonger Fonger restored the 4.x-ci-improve branch September 3, 2018 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants