openstack/monasca-agent
Code Issues Proposed changes

Fix E721 - do not compare types, use 'isinstance()'

Browse Source
This commit is contained in:
Jonathan Halterman 2014-07-02 11:24:50 -07:00
parent 194c3625dd
commit e89a258a08
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_cassandra_jmx.py
View File

@ -67,7 +67,7 @@ class JMXTestCase(unittest.TestCase):
metrics = self.reporter.metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
self.assertTrue(len([t for t in metrics if "cassandra.db." in t[
'metric'] and "instance:cassandra_instance" in t['dimensions']]) > 40, metrics)

2
tests/test_couch.py
View File

@ -22,7 +22,7 @@ class CouchDBTestCase(unittest.TestCase):
self.check.check(config['instances'][0])
metrics = self.check.get_metrics()
self.assertTrue(type(metrics) == type([]), metrics)
self.assertTrue(isinstance(metrics, list), metrics)
self.assertTrue(len(metrics) > 3)
self.assertTrue(
len([k for k in metrics if "instance:http://localhost:5984" in k[3]['dimensions']]) > 3)

2
tests/test_couchbase.py
View File

@ -64,7 +64,7 @@ class CouchbaseTestCase(unittest.TestCase):
metrics = self.check.get_metrics()
self.assertTrue(type(metrics) == type([]), metrics)
self.assertTrue(isinstance(metrics, list), metrics)
self.assertTrue(len(metrics) > 3)
self.assertTrue(
len([k for k in metrics if "instance:http://localhost:8091" in k[3]['dimensions']]) > 3)

2
tests/test_elastic.py
View File

@ -58,7 +58,7 @@ class TestElastic(unittest.TestCase):
self.check.check(conf['instances'][0])
r = self.check.get_metrics()
self.assertTrue(type(r) == type([]))
self.assertTrue(isinstance(r, list))
self.assertTrue(len(r) > 0)
self.assertEquals(len([t for t in r if t[0] == "elasticsearch.get.total"]), 1, r)
self.assertEquals(len([t for t in r if t[0] == "elasticsearch.search.fetch.total"]), 1, r)

2
tests/test_gearman.py
View File

@ -23,6 +23,6 @@ class GearmanTestCase(unittest.TestCase):
self.check.check(config['instances'][0])
metrics = self.check.get_metrics()
self.assertTrue(type(metrics) == type([]), metrics)
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) == 4)
self.assertTrue(len([k for k in metrics if "second" in k[3]['dimensions']['first']]) == 4)

4
tests/test_haproxy.py
View File

@ -92,7 +92,7 @@ class HaproxyTestCase(unittest.TestCase):
# Metric assertions
metrics = self.check.get_metrics()
assert metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
self.assertEquals(len([t for t in metrics
@ -155,7 +155,7 @@ class HaproxyTestCase(unittest.TestCase):
metrics = self.check.get_metrics()
assert metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
self.assertEquals(len([t for t in metrics

2
tests/test_java_jmx.py
View File

@ -67,7 +67,7 @@ class JMXTestCase(unittest.TestCase):
metrics = self.reporter.metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
self.assertEquals(len([t for t in metrics if t[
'metric'] == "my.metric.buf" and "instance:jmx_instance1" in t['dimensions']]), 2, metrics)

8
tests/test_mongo.py
View File

@ -101,7 +101,7 @@ class TestMongo(unittest.TestCase):
# Metric assertions
metrics = self.check.get_metrics()
assert metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
metric_val_checks = {
@ -127,7 +127,7 @@ class TestMongo(unittest.TestCase):
# Metric assertions
metrics = self.check.get_metrics()
assert metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
for m in metrics:
@ -163,7 +163,7 @@ class TestMongo(unittest.TestCase):
# Metric assertions
metrics = self.check.get_metrics()
assert metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
metric_val_checks = {
@ -192,7 +192,7 @@ class TestMongo(unittest.TestCase):
# Metric assertions
metrics = self.check.get_metrics()
assert metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
for m in metrics:

2
tests/test_solr.py
View File

@ -67,7 +67,7 @@ class JMXTestCase(unittest.TestCase):
metrics = self.reporter.metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 8, metrics)
self.assertEquals(len([t for t in metrics if 'instance:solr_instance' in t[
'dimensions'] and t['metric'] == "jvm.thread_count"]), 1, metrics)

2
tests/test_tomcat.py
View File

@ -67,7 +67,7 @@ class JMXTestCase(unittest.TestCase):
metrics = self.reporter.metrics
self.assertTrue(type(metrics) == type([]))
self.assertTrue(isinstance(metrics, list))
self.assertTrue(len(metrics) > 0)
self.assertEquals(len([t for t in metrics if t[
'metric'] == "tomcat.threads.busy" and "instance:tomcat_instance" in t['dimensions']]), 2, metrics)