Move Goexpvar to pytest #2089
Merged
Move Goexpvar to pytest #2089
Conversation
This file contains 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
ofek
requested changes
Aug 21, 2018
| @@ -108,7 +110,11 @@ def _load(self, instance): | |||
| url = parsed_url._replace(path=GO_EXPVAR_URL_PATH).geturl() | |||
|
|
|||
| tags = instance.get('tags', []) | |||
| tags.append("expvar_url:%s" % url) | |||
| self.log.warning(tags) | |||
go_expvar/tests/conftest.py
Outdated
| with open(filepath, 'r') as f: | ||
| data = f.read() | ||
| json_data = json.loads(data) | ||
| p = mock.patch('datadog_checks.go_expvar.GoExpvar._get_data', return_value=json_data) |
There was a problem hiding this comment.
the format I've used here is used all over the project, but I'll change it
go_expvar/tests/conftest.py
Outdated
| os.path.join(common.HERE, 'compose', 'docker-compose.yaml'), | ||
| endpoints=[common.URL] | ||
| ): | ||
| for _ in range(0, 9): |
There was a problem hiding this comment.
Just for _ in range(9): is fine
go_expvar/tests/test_unit.py
Outdated
|
|
||
| # Default metrics | ||
| for gauge in CHECK_GAUGES_DEFAULT: | ||
| log.warning(aggregator.metrics(gauge.format(common.CHECK_NAME))) |
go_expvar/tox.ini
Outdated
| [testenv:go_expvar] | ||
| deps = | ||
| ../datadog_checks_base | ||
| -r../datadog_checks_base/requirements.in |
There was a problem hiding this comment.
../datadog_checks_base[deps] and put deps under [testenv]
go_expvar/tox.ini
Outdated
| [testenv:unit] | ||
| deps = | ||
| ../datadog_checks_base | ||
| -r../datadog_checks_base/requirements.in |
gzussa
reviewed
Aug 22, 2018
go_expvar/tox.ini
Outdated
| [testenv:go_expvar] | ||
| deps = | ||
| ../datadog_checks_base | ||
| -r../datadog_checks_base/requirements.in |
ofek
approved these changes
Aug 22, 2018
nmuesch
pushed a commit
that referenced
this pull request
Nov 1, 2018
Includes a small change to the check itself to ensure that tags aren't duplicated
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.
What does this PR do?
GoExpvar was still on the old testing framework, this moves it to pytest and tox.
There was some weird duplication of tags. I now ensure that we only add the url tag if it's not in the config.
Review checklist
no-changeloglabel attachedAdditional Notes
I think this covers everything