Merge pull request #1501 from DataDog/yann/iis-metrics

[iis] copy metric list to test
DataDog · Apr 3, 2015 · 1243016 · 1243016
2 parents 8bc0219 + 10a984d
commit 1243016
Showing 1 changed file with 31 additions and 2 deletions.
diff --git a/tests/test_iis.py b/tests/test_iis.py
@@ -116,7 +116,7 @@ def Win32_PerfFormattedData_W3SVC_WebService(self):
                 **Win32_PerfFormattedData_W3SVC_WebService_attr)]
 
 
-class IISSTestCase(AgentCheckTest):
+class IISTestCase(AgentCheckTest):
     CHECK_NAME = 'iis'
 
     WIN_SERVICES_CONFIG = {
@@ -125,6 +125,35 @@ class IISSTestCase(AgentCheckTest):
         'sites': ["Default Web Site", "Failing site"]
     }
 
+    IIS_METRICS = [
+        'iis.uptime',
+        # Network
+        'iis.net.bytes_sent',
+        'iis.net.bytes_rcvd',
+        'iis.net.bytes_total',
+        'iis.net.num_connections',
+        'iis.net.files_sent',
+        'iis.net.files_rcvd',
+        'iis.net.connection_attempts',
+        # HTTP Methods
+        'iis.httpd_request_method.get',
+        'iis.httpd_request_method.post',
+        'iis.httpd_request_method.head',
+        'iis.httpd_request_method.put',
+        'iis.httpd_request_method.delete',
+        'iis.httpd_request_method.options',
+        'iis.httpd_request_method.trace',
+        # Errors
+        'iis.errors.not_found',
+        'iis.errors.locked',
+        # Users
+        'iis.users.anon',
+        'iis.users.nonanon',
+        # Requests
+        'iis.requests.cgi',
+        'iis.requests.isapi',
+    ]
+
     def test_check(self):
         """
         Returns the right metrics and service checks
@@ -141,7 +170,7 @@ def test_check(self):
         self.run_check_twice(config)
 
         # Test metrics
-        for mname, _, _ in self.check.METRICS:
+        for mname in self.IIS_METRICS:
             self.assertMetric(mname, tags=["mytag1", "mytag2", "site:Default Web Site"], count=1)
 
         # Test service checks