diff --git a/pyproject.toml b/pyproject.toml index ad228ca773..fca3a2fbbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,8 +89,6 @@ allow_no_jira_ticket_for_bugs = [ "tests/integrations/test_db_integrations_sql.py::Test_MsSql.test_db_name", "tests/integrations/test_db_integrations_sql.py::Test_MsSql.test_db_system", "tests/integrations/test_db_integrations_sql.py::Test_MsSql.test_db_user", - "tests/integrations/test_db_integrations_sql.py::Test_MySql.test_db_name", - "tests/integrations/test_db_integrations_sql.py::Test_MySql.test_db_user", "tests/integrations/test_db_integrations_sql.py::Test_Postgres.test_db_type", "tests/integrations/test_dbm.py::Test_Dbm.test_trace_payload_service", "tests/integrations/test_dsm.py::Test_DsmRabbitmq.test_dsm_rabbitmq", diff --git a/tests/integrations/test_db_integrations_sql.py b/tests/integrations/test_db_integrations_sql.py index f5f901b8bf..0b00dc74b1 100644 --- a/tests/integrations/test_db_integrations_sql.py +++ b/tests/integrations/test_db_integrations_sql.py @@ -244,11 +244,11 @@ class Test_MySql(_BaseDatadogDbIntegrationTestClass): db_service = "mysql" @irrelevant(library="java", reason="Java is using the correct span: db.instance") - @bug(library="python", reason="the value of this span should be 'world' instead of 'b'world'' ") + @bug(context.library < "python@2.12.2", reason="APMRP-360") def test_db_name(self): super().test_db_name() - @bug(library="python", reason="the value of this span should be 'mysqldb' instead of 'b'mysqldb'' ") + @bug(context.library < "python@2.12.2", reason="APMRP-360") def test_db_user(self, excluded_operations=()): super().test_db_user() diff --git a/tests/integrations/test_dbm.py b/tests/integrations/test_dbm.py index ac762de755..3344453f50 100644 --- a/tests/integrations/test_dbm.py +++ b/tests/integrations/test_dbm.py @@ -186,6 +186,10 @@ class Test_Dbm_Comment_Batch_Python_Psycopg(_Test_Dbm_Comment): dddbs = "system_tests_dbname" # db name ddh = "postgres" # container name + @flaky(library="python", reason="APMAPI-724") + def test_dbm_comment(self): + return super().test_dbm_comment() + @irrelevant(condition=context.library != "python", reason="These are python only tests.") @features.database_monitoring_support @@ -285,6 +289,10 @@ class Test_Dbm_Comment_Python_Pymysql(_Test_Dbm_Comment): dddbs = "mysql_dbname" # db name ddh = "mysqldb" # container name + @flaky(library="python", reason="APMAPI-724") + def test_dbm_comment(self): + return super().test_dbm_comment() + @irrelevant(condition=context.library != "python", reason="These are python only tests.") @features.database_monitoring_support diff --git a/tests/integrations/test_dsm.py b/tests/integrations/test_dsm.py index 58c12b53a2..8b12a3f586 100644 --- a/tests/integrations/test_dsm.py +++ b/tests/integrations/test_dsm.py @@ -12,7 +12,7 @@ delete_sns_topic, ) -from utils import weblog, interfaces, scenarios, irrelevant, context, bug, features, missing_feature +from utils import weblog, interfaces, scenarios, irrelevant, context, bug, features, missing_feature, flaky from utils.tools import logger @@ -124,6 +124,7 @@ def setup_dsm_rabbitmq(self): library="dotnet", reason="Dotnet calculates 3168906112866048140 as producer hash by using 'routing_key:True' in edge tags, with 'True' capitalized, resulting in different hash.", ) + @flaky(library="python", reason="APMAPI-724") def test_dsm_rabbitmq(self): assert self.r.text == "ok"