ibm_i integration produces CRITICAL service check if it cannot connect

ibm_i/datadog_checks/ibm_i/check.py

@@ -37,12 +37,15 @@ def check(self, _):
         try:
             self.query_manager.execute()
             check_status = AgentCheck.OK
+            hostname = self._query_manager.hostname
         except AttributeError as e:
             self.warning('Could not set up query manager, skipping check run: %s', e)
-            check_status = None
+            check_status = AgentCheck.CRITICAL
+            hostname = self.config.hostname if self.config else None
         except Exception as e:
             self._delete_connection_subprocess(e)
             check_status = AgentCheck.CRITICAL
+            hostname = self.config.hostname if self.config else None
 
         # At least one query failed, set the service check as failing
         if self._current_errors:
@@ -52,8 +55,8 @@ def check(self, _):
             self.service_check(
                 self.SERVICE_CHECK_NAME,
                 check_status,
-                tags=self.config.tags,
-                hostname=self._query_manager.hostname,
+                tags=self.config.tags if self.config else None,
+                hostname=hostname,
             )
 
     def cancel(self):

ibm_i/tests/conftest.py

@@ -6,7 +6,7 @@
 
 @pytest.fixture(scope='session')
 def dd_environment():
-    yield
+    yield {'tags': ['foo:bar']}
 
 
 @pytest.fixture

ibm_i/tests/test_e2e.py

@@ -0,0 +1,9 @@
+import pytest
+
+from datadog_checks.ibm_i import IbmICheck
+
+
+@pytest.mark.e2e
+def test_e2e(dd_agent_check, aggregator, instance):
+    aggregator = dd_agent_check(instance)
+    aggregator.assert_service_check("ibm_i.can_connect", IbmICheck.CRITICAL)

ibm_i/tox.ini

@@ -8,6 +8,8 @@ envlist =
 
 [testenv]
 dd_check_style = true
+description=
+    py38: e2e ready
 usedevelop = true
 platform = linux|darwin|win32
 extras = deps