Improve Postgres autodiscovery test performance (DataDog#21459)

* Improve Postgres autodiscovery test performance

* Clean

* Clean

Author: sethsamuel

postgres/tests/test_discovery.py

@@ -87,7 +87,6 @@ def test_autodiscovery_simple(integration_check, pg_instance):
     Test simple autodiscovery.
     """
     pg_instance["database_autodiscovery"] = DISCOVERY_CONFIG
-    pg_instance['relations'] = ['pg_index']
     del pg_instance['dbname']
     check = integration_check(pg_instance)
     run_one_check(check, pg_instance)
@@ -106,7 +105,6 @@ def test_autodiscovery_global_view_db_specified(integration_check, pg_instance):
     """
     pg_instance["database_autodiscovery"] = copy.deepcopy(DISCOVERY_CONFIG)
     pg_instance["database_autodiscovery"]["global_view_db"] = "dogs_0"
-    pg_instance['relations'] = ['pg_index']
     del pg_instance['dbname']
     check = integration_check(pg_instance)
     run_one_check(check, pg_instance)
@@ -125,7 +123,6 @@ def test_autodiscovery_max_databases(integration_check, pg_instance):
     """
     pg_instance["database_autodiscovery"] = copy.deepcopy(DISCOVERY_CONFIG)
     pg_instance['database_autodiscovery']['max_databases'] = 20
-    pg_instance['relations'] = ['pg_index']
     del pg_instance['dbname']
 
     check = integration_check(pg_instance)
@@ -158,7 +155,6 @@ def test_autodiscovery_refresh(integration_check, pg_instance):
 
     pg_instance["database_autodiscovery"] = copy.deepcopy(DISCOVERY_CONFIG)
     pg_instance['database_autodiscovery']['include'].append(database_to_find)
-    pg_instance['relations'] = ['pg_index']
     del pg_instance['dbname']
     pg_instance["database_autodiscovery"]['refresh'] = 1
     check = integration_check(pg_instance)
@@ -184,21 +180,6 @@ def test_autodiscovery_refresh(integration_check, pg_instance):
             )
 
 
-@pytest.mark.integration
-@pytest.mark.usefixtures('dd_environment')
-def test_autodiscovery_relations_disabled(integration_check, pg_instance):
-    """
-    If no relation metrics are being collected, autodiscovery should still run.
-    """
-    pg_instance["database_autodiscovery"] = DISCOVERY_CONFIG
-    pg_instance['relations'] = []
-    del pg_instance['dbname']
-    check = integration_check(pg_instance)
-    run_one_check(check, pg_instance)
-
-    assert check.autodiscovery is not None
-
-
 @pytest.mark.integration
 @pytest.mark.usefixtures('dd_environment')
 def test_autodiscovery_collect_all_metrics(aggregator, integration_check, pg_instance):
@@ -265,18 +246,12 @@ def test_autodiscovery_exceeds_min_interval(aggregator, integration_check, pg_in
     """
     pg_instance["database_autodiscovery"] = copy.deepcopy(DISCOVERY_CONFIG)
     pg_instance["database_autodiscovery"]["include"] = ["dogs$", "dogs_noschema$", "dogs_nofunc$"]
-    pg_instance['relations'] = [
-        {'relation_regex': '.*'},
-    ]
     pg_instance['min_collection_interval'] = 0.001
     del pg_instance['dbname']
 
     check = integration_check(pg_instance)
     check.check(pg_instance)
 
-    aggregator.assert_metric(
-        'dd.postgres._collect_relations_autodiscovery.time',
-    )
     assert len(check.warnings) == 1
     test_structure = re.compile(
         "Collecting metrics on autodiscovery metrics took .* ms, which is longer than "
@@ -293,7 +268,6 @@ def test_autodiscovery_dbname_specified(integration_check, pg_instance):
     If a dbname is specified in the config, autodiscovery should not run.
     """
     pg_instance["database_autodiscovery"] = DISCOVERY_CONFIG
-    pg_instance['relations'] = ['breed']
     pg_instance['dbname'] = "dogs_30"
 
     with pytest.raises(ConfigurationError):
@@ -315,9 +289,6 @@ def test_handle_cannot_connect(aggregator, integration_check, pg_instance):
     db_to_disable = "dogs_0"
     _set_allow_connection(db_to_disable, False)
     pg_instance["database_autodiscovery"] = {"enabled": True, "include": ["dogs_[0-3]"]}
-    pg_instance['relations'] = [
-        {'relation_regex': '.*'},
-    ]
     del pg_instance['dbname']
     check = integration_check(pg_instance)
     run_one_check(check, pg_instance)