From 76a249ca90b3fd7cafaf5ef06f9e5e9798d58943 Mon Sep 17 00:00:00 2001 From: Julia <611228+hithwen@users.noreply.github.com> Date: Tue, 7 Dec 2021 17:52:37 +0100 Subject: [PATCH] Skip the test, not the fixture (#10802) --- mysql/tests/conftest.py | 3 +-- mysql/tests/test_mysql.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql/tests/conftest.py b/mysql/tests/conftest.py index 1aca79ab5dcea..9ef1c7dfde131 100644 --- a/mysql/tests/conftest.py +++ b/mysql/tests/conftest.py @@ -12,7 +12,7 @@ from datadog_checks.dev.conditions import CheckDockerLogs from . import common, tags -from .common import MYSQL_REPLICATION, requires_static_version +from .common import MYSQL_REPLICATION logger = logging.getLogger(__name__) @@ -249,7 +249,6 @@ def instance_error(): return {'host': common.HOST, 'user': 'unknown', 'pass': common.PASS, 'disable_generic_tags': 'true'} -@requires_static_version @pytest.fixture(scope='session') def version_metadata(): parts = MYSQL_VERSION.split('-') diff --git a/mysql/tests/test_mysql.py b/mysql/tests/test_mysql.py index f5bf04314a73b..c3c0347773b22 100644 --- a/mysql/tests/test_mysql.py +++ b/mysql/tests/test_mysql.py @@ -13,7 +13,7 @@ from datadog_checks.mysql import MySql from . import common, tags, variables -from .common import MYSQL_REPLICATION, MYSQL_VERSION_PARSED +from .common import MYSQL_REPLICATION, MYSQL_VERSION_PARSED, requires_static_version @pytest.mark.integration @@ -291,6 +291,7 @@ def _test_optional_metrics(aggregator, optional_metrics): assert before > after +@requires_static_version @pytest.mark.integration @pytest.mark.usefixtures('dd_environment') def test_version_metadata(dd_run_check, instance_basic, datadog_agent, version_metadata):