Skip to content

[6.x] [Status] Organize metrics stuff into metrics_collector, tests into __test__ directories, remove mock-fs for the cgroup test (#17788)#18578

Merged
tsullivan merged 1 commit intoelastic:6.xfrom
tsullivan:backport/6.x/pr-17788
Apr 30, 2018
Merged

Conversation

@tsullivan
Copy link
Copy Markdown
Member

Backports the following commits to 6.x:

…_test__ directories, remove mock-fs for the cgroup test (elastic#17788)

* [Status] Organize tests into __test__ directories

* custom mock for fs in cgroups test

* work around unhandled rejection errors

* simplify fserror construct

* put fs readFile mockImpl in beforeAll for pretty

* undo hacking the code to suppress unhandled promise rejections

* test files back to sibling of the module
@tsullivan tsullivan added the backport This PR is a backport of another PR label Apr 25, 2018
@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@tsullivan
Copy link
Copy Markdown
Member Author

jenkins test this

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@tsullivan tsullivan merged commit d3b4cf5 into elastic:6.x Apr 30, 2018
@tsullivan tsullivan deleted the backport/6.x/pr-17788 branch April 30, 2018 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR v6.4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants