Skip to content

Commit 459e8c1

Browse files
authored
Remove expected metric from tests (#10562)
* Comment out flakey test * Remove assert_all_metrics call * Remove other assert_all_metrics
1 parent ab53937 commit 459e8c1

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

hdfs_datanode/tests/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
'hdfs.datanode.num_blocks_cached',
3434
'hdfs.datanode.num_failed_volumes',
3535
'hdfs.datanode.num_blocks_failed_to_cache',
36-
'hdfs.datanode.num_blocks_failed_to_uncache',
36+
# 'hdfs.datanode.num_blocks_failed_to_uncache', metric is flakey in 3.1.3
3737
]
3838

3939
HDFS_DATANODE_CONFIG = {'instances': [{'hdfs_datanode_jmx_uri': DATANODE_URI, 'tags': list(CUSTOM_TAGS)}]}
@@ -61,7 +61,7 @@
6161
'hdfs.datanode.num_blocks_cached': 0,
6262
'hdfs.datanode.num_failed_volumes': 0,
6363
'hdfs.datanode.num_blocks_failed_to_cache': 0,
64-
'hdfs.datanode.num_blocks_failed_to_uncache': 0,
64+
# 'hdfs.datanode.num_blocks_failed_to_uncache': 0, metric is flakey in 3.1.3
6565
}
6666

6767
HDFS_DATANODE_METRIC_TAGS = ['datanode_url:{}'.format(DATANODE_URI)]

hdfs_datanode/tests/test_e2e.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010

1111
@pytest.mark.e2e
1212
def test_e2e(dd_agent_check, instance):
13+
# We do not do aggregator.assert_all_metrics_covered() because depending on timing, some other metrics may appear
1314
aggregator = dd_agent_check(instance, rate=True)
1415

1516
tags = ['datanode_url:{}'.format(instance["hdfs_datanode_jmx_uri"])]
1617

1718
for metric in common.EXPECTED_METRICS:
1819
aggregator.assert_metric(metric, tags=tags)
1920

20-
aggregator.assert_all_metrics_covered()
21-
2221
aggregator.assert_service_check('hdfs.datanode.jmx.can_connect', status=HDFSDataNode.OK, tags=tags)

hdfs_datanode/tests/test_hdfs_datanode.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
def test_check(aggregator, mocked_request):
2525
"""
2626
Test that we get all the metrics we're supposed to get
27+
Note: We don't do aggregator.assert_all_metrics_covered() because depending on timing, some other metrics may appear
2728
"""
2829

2930
instance = HDFS_DATANODE_CONFIG['instances'][0]
@@ -40,8 +41,6 @@ def test_check(aggregator, mocked_request):
4041
for metric, value in iteritems(HDFS_DATANODE_METRICS_VALUES):
4142
aggregator.assert_metric(metric, value=value, tags=HDFS_DATANODE_METRIC_TAGS + CUSTOM_TAGS, count=1)
4243

43-
aggregator.assert_all_metrics_covered()
44-
4544

4645
def test_metadata(aggregator, mocked_request, mocked_metadata_request, datadog_agent):
4746
"""

0 commit comments

Comments
 (0)