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

[sdk] minor tweaks - sdk env detection, check location #2694

Merged
merged 2 commits into from
Jul 25, 2016
Merged

Conversation

truthbk
Copy link
Member

@truthbk truthbk commented Jul 20, 2016

AgentCheckTest.load_check() and load_check() in tests.checks.common are both needed, one by integration tests, the other by unit tests (respectively). We could maybe get rid of the former but it would involve too many changes at the moment. The proposed changes will allow both unit tests (if added in the SDK) and integration tests to correctly load the checks in the testing infrastructure.

Also, because integrations-core would've been dropped into 3rd-party, and that is misleading, renaming to dd-integrations.

@olivielpeau
Copy link
Member

LGTM! :shipit:

@olivielpeau
Copy link
Member

olivielpeau commented Jul 25, 2016

integrations ❤️

Let's merge once the CI passes

@degemer
Copy link
Member

degemer commented Jul 25, 2016

Default, core_integration and checks_mock are 💚 . Merging.

@degemer degemer merged commit 53a66ea into master Jul 25, 2016
@degemer degemer deleted the jaime/sdktweaks branch July 25, 2016 21:38
degemer pushed a commit that referenced this pull request Jul 25, 2016
* [sdk] check if SDK or not for integration and unit tests.

* [tests] fixing for new sdk `integrations` path/, instead of `3rd-party`.
degemer added a commit that referenced this pull request Jul 28, 2016
* master: (119 commits)
  [core] remove noisy logs (#2715)
  run multiple instances of pylint (#2716)
  [packaging] Release 5.8.5 (#2712)
  [changelog][5.8.5] Add notes on packaging changes (#2710)
  [changelog] Update 5.8.5 with python upgrade
  be more specific when logging ssh errors (#2708)
  [marathon] allow base_url with path (#2620)
  [changelog] Update 5.8.5
  add issue and pr templates
  [sdk] minor tweaks - sdk env detection, check location (#2694)
  [http_check] log exceptions 🔊
  use 0.0.0.0 as server address when non_local_traffic is passed (#2691)
  [elastic] tag stats metric with the node name 🏷 (#2696)
  [openstack] moving proxy logic to AgentCheck, for maintainability. Fixing typos.
  [changelog] 5.8.5 draft
  [tests] lower flakiness of test_no_parallelism (#2690)
  [core] don't use docker hostname if it's a EC2 one (#2661)
  [haproxy] Fix `KeyError` when an unknown status is found (#2681)
  [changelog] Fix md links
  [jenkins] Deprecate check (#2688)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants