Skip to content

Commit

Permalink
[python] skip flaky tests (APMAPI-724) (#3071)
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeauchesne committed Sep 19, 2024
1 parent 17b99b6 commit f8d8360
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tests/integrations/test_db_integrations_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
8 changes: 8 additions & 0 deletions tests/integrations/test_dbm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/integrations/test_dsm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit f8d8360

Please sign in to comment.