fix e501

DataDog · Mar 13, 2019 · cf1ac33 · cf1ac33
1 parent 1ce103d
commit cf1ac33
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/postgres/tests/test_common.py b/postgres/tests/test_common.py
@@ -78,7 +78,9 @@ def check_bgw_metrics(aggregator, expected_tags):
 def test_common_metrics(aggregator, check, pg_instance):
     check.check(pg_instance)
 
-    expected_tags = pg_instance['tags'] + ['pg_instance:{}-{}'.format(HOST, PORT)]
+    expected_tags = pg_instance['tags'] + [
+        'pg_instance:{}-{}'.format(HOST, PORT),
+    ]
     check_bgw_metrics(aggregator, expected_tags)
 
     expected_tags += ['db:{}'.format(DB_NAME)]
@@ -110,8 +112,12 @@ def test_can_connect_service_check(aggregator, check, pg_instance):
 def test_schema_metrics(aggregator, check, pg_instance):
     check.check(pg_instance)
 
+    expected_tags = pg_instance['tags'] + [
+        'pg_instance:{}-{}'.format(HOST, PORT),
+        'schema:public',
+    ]
     aggregator.assert_metric('postgresql.table.count', value=1, count=1,
-                             tags=pg_instance['tags'] + ['schema:public', 'pg_instance:{}-{}'.format(HOST, PORT)])
+                             tags=expected_tags)
     aggregator.assert_metric('postgresql.db.count', value=2, count=1)
 
 
@@ -135,8 +141,12 @@ def test_locks_metrics(aggregator, check, pg_instance):
             cur.execute('LOCK persons')
             check.check(pg_instance)
 
-    tags = pg_instance['tags'] + ['lock_mode:AccessExclusiveLock', 'table:persons', 'db:datadog_test', 'pg_instance:{}-{}'.format(HOST, PORT)]
-    aggregator.assert_metric('postgresql.locks', count=1, tags=tags)
+    expected_tags = pg_instance['tags'] + [
+        'pg_instance:{}-{}'.format(HOST, PORT),
+        'db:datadog_test',
+        'lock_mode:AccessExclusiveLock', 'table:persons',
+    ]
+    aggregator.assert_metric('postgresql.locks', count=1, tags=expected_tags)
 
 
 @pytest.mark.integration
@@ -145,5 +155,9 @@ def test_activity_metrics(aggregator, check, pg_instance):
     pg_instance['collect_activity_metrics'] = True
     check.check(pg_instance)
 
+    expected_tags = pg_instance['tags'] + [
+        'pg_instance:{}-{}'.format(HOST, PORT),
+        'db:datadog_test',
+    ]
     for name in ACTIVITY_METRICS:
-        aggregator.assert_metric(name, count=1, tags=pg_instance['tags'] + ['db:datadog_test', 'pg_instance:{}-{}'.format(HOST, PORT)])
+        aggregator.assert_metric(name, count=1, tags=expected_tags)
diff --git a/postgres/tests/test_custom_metrics.py b/postgres/tests/test_custom_metrics.py
@@ -23,7 +23,10 @@ def test_custom_metrics(aggregator, pg_instance):
     postgres_check = PostgreSql('postgres', {}, {})
     postgres_check.check(pg_instance)
 
-    tags = ['customdb:a', 'pg_instance:{}-{}'.format(pg_instance['host'], pg_instance['port'])] + pg_instance['tags']
+    tags = pg_instance['tags'] + [
+        'pg_instance:{}-{}'.format(pg_instance['host'], pg_instance['port']),
+        'customdb:a',
+    ]
     aggregator.assert_metric('custom.num', value=21, tags=tags)
 
 

diff --git a/postgres/tests/test_relations.py b/postgres/tests/test_relations.py
@@ -52,8 +52,18 @@ def test_relations_metrics(aggregator, pg_instance):
     posgres_check = PostgreSql('postgres', {}, {})
     posgres_check.check(pg_instance)
 
-    expected_tags = pg_instance['tags'] + ['db:%s' % pg_instance['dbname'], 'table:persons', 'schema:public', 'pg_instance:{}-{}'.format(pg_instance['host'], pg_instance['port'])]
-    expected_size_tags = pg_instance['tags'] + ['db:%s' % pg_instance['dbname'], 'table:persons', 'pg_instance:{}-{}'.format(pg_instance['host'], pg_instance['port'])]
+    expected_tags = pg_instance['tags'] + [
+        'pg_instance:{}-{}'.format(pg_instance['host'], pg_instance['port']),
+        'db:%s' % pg_instance['dbname'],
+        'table:persons', 'schema:public',
+    ]
+
+    expected_size_tags = pg_instance['tags'] + [
+        'pg_instance:{}-{}'.format(pg_instance['host'], pg_instance['port']),
+        'db:%s' % pg_instance['dbname'],
+        'table:persons',
+    ]
+
     for name in RELATION_METRICS:
         aggregator.assert_metric(name, count=1, tags=expected_tags)
 
@@ -74,7 +84,10 @@ def test_index_metrics(aggregator, pg_instance):
     posgres_check = PostgreSql('postgres', {}, {})
     posgres_check.check(pg_instance)
 
-    expected_tags = ['db:dogs', 'table:breed', 'index:breed_names', 'schema:public', 'pg_instance:{}-{}'.format(pg_instance['host'], pg_instance['port'])]
-    expected_tags += pg_instance['tags']
+    expected_tags = pg_instance['tags'] + [
+        'pg_instance:{}-{}'.format(pg_instance['host'], pg_instance['port']),
+        'db:dogs', 'table:breed', 'index:breed_names', 'schema:public',
+    ]
+
     for name in IDX_METRICS:
         aggregator.assert_metric(name, count=1, tags=expected_tags)