Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip the test, not the fixture #10802

Merged
merged 1 commit into from
Dec 7, 2021
Merged

Skip the test, not the fixture #10802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions mysql/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down Expand Up @@ -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('-')
Expand Down
3 changes: 2 additions & 1 deletion mysql/tests/test_mysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand Down