responds to comments

DataDog · Aug 22, 2018 · e2093e4 · e2093e4
1 parent a6e85a1
commit e2093e4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/go_expvar/datadog_checks/go_expvar/go_expvar.py b/go_expvar/datadog_checks/go_expvar/go_expvar.py
@@ -110,7 +110,6 @@ def _load(self, instance):
             url = parsed_url._replace(path=GO_EXPVAR_URL_PATH).geturl()
 
         tags = instance.get('tags', [])
-        self.log.warning(tags)
         expvar_url_tag = "expvar_url:%s" % url
         if expvar_url_tag not in tags:
             tags.append(expvar_url_tag)

diff --git a/go_expvar/tests/conftest.py b/go_expvar/tests/conftest.py
@@ -23,9 +23,8 @@ def go_expvar_mock():
     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)
-    yield p.start()
-    p.stop()
+    with mock.patch('datadog_checks.go_expvar.GoExpvar._get_data', return_value=json_data):
+        yield
 
 
 @pytest.fixture(scope="session")
@@ -38,9 +37,8 @@ def spin_up_go_expvar():
         os.path.join(common.HERE, 'compose', 'docker-compose.yaml'),
         endpoints=[common.URL]
     ):
-        for _ in range(0, 9):
+        for _ in range(9):
             requests.get(common.URL + "?user=123456")
-
         yield
 
 

diff --git a/go_expvar/tests/test_unit.py b/go_expvar/tests/test_unit.py
@@ -169,7 +169,6 @@ def test_max_metrics(go_expvar_mock, check, aggregator):
 
     # Default metrics
     for gauge in CHECK_GAUGES_DEFAULT:
-        log.warning(aggregator.metrics(gauge.format(common.CHECK_NAME)))
         aggregator.assert_metric(gauge.format(common.CHECK_NAME),
                                  count=2, tags=shared_tags)
 

diff --git a/go_expvar/tox.ini b/go_expvar/tox.ini
@@ -8,24 +8,21 @@ envlist =
 
 [testenv]
 platform = darwin|linux|win32
+deps =
+    ../datadog_checks_base[deps]
+    -r../datadog_checks_base/requirements.in
+    -rrequirements-dev.txt
 passenv =
     DOCKER*
     COMPOSE*
 
 [testenv:go_expvar]
-deps =
-    ../datadog_checks_base
-    -r../datadog_checks_base/requirements.in
-    -rrequirements-dev.txt
+
 commands =
     pip install --require-hashes -r requirements.txt
     pytest -v -m"integration"
 
 [testenv:unit]
-deps =
-    ../datadog_checks_base
-    -r../datadog_checks_base/requirements.in
-    -rrequirements-dev.txt
 commands =
     pip install --require-hashes -r requirements.txt
     pytest -v -m"not integration"