Fix as per review

DataDog · Apr 2, 2015 · f518f21 · f518f21
1 parent 05e4212
commit f518f21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/tests/common.py b/tests/common.py
@@ -120,15 +120,13 @@ def __init__(self, *args, **kwargs):
 
         self.check = None
 
-    def reset(self):
-        self.check = None
-
     def is_travis(self):
         return "TRAVIS" in os.environ
 
     # Helper function when testing rates
-    def run_check_twice(self, config, agent_config=None, mocks=None):
-        self.run_check(config, agent_config, mocks)
+    def run_check_twice(self, config, agent_config=None, mocks=None,
+        force_reload=False):
+        self.run_check(config, agent_config, mocks, force_reload)
         time.sleep(1)
         self.run_check(config, agent_config, mocks)
 

diff --git a/tests/test_mcache.py b/tests/test_mcache.py
@@ -98,7 +98,6 @@ def testCoverage(self):
 
         self.coverage_report()
 
-        self.reset()
         config = {
             'init_config': {},
             'instances': [
@@ -108,7 +107,7 @@ def testCoverage(self):
             ]
         }
 
-        self.run_check_twice(config)
+        self.run_check_twice(config, force_reload=True)
         for tags in tag_set:
             for m in GAUGES:
                 self.assertMetric("memcache.{0}".format(m), tags=tags, count=1)
@@ -117,7 +116,6 @@ def testCoverage(self):
                     "memcache.{0}_rate".format(m), tags=tags, count=1)
 
         good_service_check_tags = ["host:localhost", "port:{0}".format(PORT)]
-        bad_service_check_tags = ["host:unix", "port:foo/bar"]
 
         self.assertServiceCheck(
             SERVICE_CHECK, status=AgentCheck.OK,
@@ -172,6 +170,3 @@ def testMemoryLeak(self):
             self.assertEquals(end - start, 0, gc.garbage)
         finally:
             gc.set_debug(0)
-
-if __name__ == '__main__':
-    unittest.main()