Override the default test options for some integrations (#15779)

DataDog · Sep 8, 2023 · 9612756 · 9612756
1 parent a10f3d9
commit 9612756
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 16 deletions.
diff --git a/.github/workflows/pr-all.yml b/.github/workflows/pr-all.yml
@@ -7,6 +7,7 @@ on:
     paths:
     - datadog_checks_base/datadog_checks/**
     - datadog_checks_dev/datadog_checks/dev/*.py
+    - ddev/src/**
     - "!datadog_checks_base/datadog_checks/base/data/agent_requirements.in"
 
 concurrency:

diff --git a/datadog_checks_dev/CHANGELOG.md b/datadog_checks_dev/CHANGELOG.md
@@ -19,6 +19,7 @@
 * Remove flup from the dependency bump exclusion list ([#15748](https://github.com/DataDog/integrations-core/pull/15748))
 * Remove setuptools from the build-system for new integrations ([#15766](https://github.com/DataDog/integrations-core/pull/15766))
 * Stop using the old GPG_COMMAND constant from securesystemslib ([#15776](https://github.com/DataDog/integrations-core/pull/15776))
+* Override the default test options for some integrations ([#15779](https://github.com/DataDog/integrations-core/pull/15779))
 
 ## 24.1.0 / 2023-08-25
 

diff --git a/datadog_checks_dev/hatch.toml b/datadog_checks_dev/hatch.toml
@@ -21,9 +21,6 @@ python = ["2.7", "3.9"]
 matrix.python.features = [
   { value = "cli", if = ["3.9"] },
 ]
-matrix.python.scripts = [
-  { key = "test", value = "_dd-test --ignore tests/tooling", if = ["2.7"] },
-]
 # TODO: remove this when the old CLI is gone
 matrix.python.pre-install-commands = [
   { value = "python -m pip install --no-deps --disable-pip-version-check {verbosity:flag:-1} -e ../ddev", if = ["3.9"] },

diff --git a/datadog_checks_dev/pyproject.toml b/datadog_checks_dev/pyproject.toml
@@ -118,3 +118,6 @@ include = [
 dev-mode-dirs = [
     ".",
 ]
+
+[tool.pytest.ini_options]
+testpaths = "tests"
diff --git a/datadog_checks_dev/setup.cfg b/datadog_checks_dev/setup.cfg
@@ -0,0 +1,6 @@
+# (C) Datadog, Inc. 2023-present
+# All rights reserved
+# Licensed under a 3-clause BSD style license (see LICENSE)
+[tool:pytest]
+addopts = "--ignore=tests/tooling"
+testpaths = tests
diff --git a/datadog_checks_downloader/CHANGELOG.md b/datadog_checks_downloader/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+***Fixed***:
+
+* Override the default test options for some integrations ([#15779](https://github.com/DataDog/integrations-core/pull/15779))
+
 ## 4.3.0 / 2023-08-25
 
 ***Security***:

diff --git a/datadog_checks_downloader/hatch.toml b/datadog_checks_downloader/hatch.toml
@@ -3,11 +3,6 @@
 [[envs.default.matrix]]
 python = ["3.9"]
 
-[envs.default.overrides]
-matrix.python.scripts = [
-  { key = "test", value = "_dd-test --capture=no --log-cli-level=debug" },
-]
-
 [envs.default]
 e2e-env = false
 dependencies = [

diff --git a/datadog_checks_downloader/pyproject.toml b/datadog_checks_downloader/pyproject.toml
@@ -61,3 +61,6 @@ include = [
 dev-mode-dirs = [
     ".",
 ]
+
+[tool.pytest.ini_options]
+addopts = "--capture=no --log-cli-level=debug"
diff --git a/teamcity/CHANGELOG.md b/teamcity/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+***Fixed***:
+
+* Override the default test options for some integrations ([#15779](https://github.com/DataDog/integrations-core/pull/15779))
+
 ## 4.0.0 / 2023-08-10
 
 ***Changed***:

diff --git a/teamcity/hatch.toml b/teamcity/hatch.toml
@@ -12,9 +12,6 @@ impl = ["legacy", "openmetrics"]
 matrix.impl.env-vars = [
   { key = "USE_OPENMETRICS", value = "true", if = ["openmetrics"] },
 ]
-matrix.python.scripts = [
-  { key = "test", value = "_dd-test --ignore=tests/docker" },
-]
 
 [envs.default.env-vars]
 DDEV_SKIP_GENERIC_TAGS_CHECK = "true"
diff --git a/teamcity/pyproject.toml b/teamcity/pyproject.toml
@@ -60,3 +60,6 @@ include = [
 dev-mode-dirs = [
     ".",
 ]
+
+[tool.pytest.ini_options]
+addopts = "--ignore=tests/docker"
diff --git a/teamcity/setup.cfg b/teamcity/setup.cfg
@@ -0,0 +1,5 @@
+# (C) Datadog, Inc. 2023-present
+# All rights reserved
+# Licensed under a 3-clause BSD style license (see LICENSE)
+[tool:pytest]
+addopts = "--ignore=tests/docker"
diff --git a/win32_event_log/hatch.toml b/win32_event_log/hatch.toml
@@ -8,8 +8,3 @@ e2e-env = false
 platforms = [
   "windows",
 ]
-
-[envs.default.overrides]
-matrix.python.scripts = [
-  { key = "test", value = "pytest -v --benchmark-skip tests/legacy", if = ["2.7"] },
-]
diff --git a/win32_event_log/setup.cfg b/win32_event_log/setup.cfg
@@ -0,0 +1,5 @@
+# (C) Datadog, Inc. 2023-present
+# All rights reserved
+# Licensed under a 3-clause BSD style license (see LICENSE)
+[tool:pytest]
+testpaths = "tests/legacy"