Fix flake tests

appveyor.yml

@@ -8,7 +8,7 @@ environment:
   NOSE_FILTER: not unix and not fixme and not winfixme
   PYWIN_PATH: C:\projects\integrations-core\.cache\pywin32-py2.7.exe
   SKIP_LINT: true
-  DD_AGENT_BRANCH: db/pdh_base_updates
+  DD_AGENT_BRANCH: master
   SDK_TESTING: true
   PYTHON: C:\\Python27-x64
   PYTHON_VERSION: 2.7.13

iis/check.py

@@ -5,8 +5,6 @@
 '''
 Check the performance counters from IIS
 '''
-# 3p
-import pythoncom
 
 # project
 from checks import AgentCheck
@@ -16,9 +14,7 @@
     def PDHBaseCheck(*args, **kwargs):
         return
 
-from config import _is_affirmative
 from utils.containers import hash_mutable
-from utils.timeout import TimeoutException
 
 DEFAULT_COUNTERS = [
     ["Web Service", None, "Service Uptime", "iis.uptime", "gauge"],
@@ -119,10 +115,9 @@ def check(self, instance):
 
             except Exception as e:
                 # don't give up on all of the metrics because one failed
-                self.log.error("IIS Failed to get data for %s %s: %s" % (inst_name, dd_name, str(e)))
+                self.log.error("IIS Failed to get metric data for %s %s: %s" % (inst_name, dd_name, str(e)))
                 pass
-        self.log.debug("expected sites is now %s" % str(expected_sites))
+
         for site in expected_sites:
             self.service_check(self.SERVICE_CHECK, AgentCheck.CRITICAL,
                             tags=['site:{0}'.format(self.normalize(site))])
-