Replace Mongo tests with updated tests.#871
Merged
tylerbenson merged 4 commits intomasterfrom Jun 13, 2019
Merged
Conversation
d6a97f8 to
de77685
Compare
Otherwise there is a race condition between the projects initializing the mongo instance.
1c978c3 to
75b626a
Compare
mar-kolya
reviewed
Jun 13, 2019
|
|
||
| import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace | ||
|
|
||
| @Timeout(10) |
Contributor
Author
There was a problem hiding this comment.
I like adding timeouts when making blocking calls and it was cleaner to add it once here than on each get() below.
mar-kolya
reviewed
Jun 13, 2019
| testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+' | ||
| testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0' | ||
| testCompile project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output | ||
| testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5' |
Contributor
There was a problem hiding this comment.
Did you consider using mongo container instead? just and idea
Contributor
Author
There was a problem hiding this comment.
I've heard other tracers have had bad luck with it. This seemed to be pretty reliable, so I didn't want to fuss with it.
mar-kolya
approved these changes
Jun 13, 2019
Contributor
mar-kolya
left a comment
There was a problem hiding this comment.
LGTM, couple of comments.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I think these were the last remaining "legacy" integration tests!
Done in preparation for changes to Mongo instrumentation.