chore(test): modernise and skip db2 tests on arm64

- add pytest skip to ibm_db2 tests on arm64 and mark module as x86_64
  only in requirements-dev.txt
- move 'testing' helpers module under tests/ and load via conftest for
  better compatibility when testing installed module / under venv

Signed-off-by: Dominic Evans <[email protected]>

Author: dnwe

.pre-commit-config.yaml

@@ -11,6 +11,7 @@ repos:
           - id: double-quote-string-fixer
           - id: end-of-file-fixer
           - id: name-tests-test
+            exclude: "^tests/testing/.*$"
           - id: trailing-whitespace
     - repo: https://github.com/pycqa/flake8
       rev: 3.9.2

requirements-dev.txt

@@ -12,7 +12,7 @@ responses
 tox-pip-extensions
 tox>=3.8
 unidiff
-ibm_db
+ibm_db; platform_machine == 'x86_64'
 boxsdk[jwt]
 pyahocorasick
 tabulate

setup.cfg

@@ -3,3 +3,6 @@ description-file = README.md
 
 [wheel]
 universal = True
+
+[tool:pytest]
+norecursedirs=tests/testing

tests/conftest.py

@@ -0,0 +1,4 @@
+import sys
+import os
+
+sys.path.append(os.path.join(os.path.dirname(__file__), "testing"))

tests/main_test.py

@@ -1,20 +1,20 @@
 import json
+import platform
 import shlex
 import textwrap
 from contextlib import contextmanager
 
 import mock
 import pytest
-
-from detect_secrets import main as main_module
 from detect_secrets import VERSION
+from detect_secrets import main as main_module
 from detect_secrets.core import audit as audit_module
 from detect_secrets.core.constants import POTENTIAL_SECRET_DETECTED_NOTE
 from detect_secrets.main import main
 from detect_secrets.plugins.common.util import import_plugins
+
 from testing.factories import secrets_collection_factory
-from testing.mocks import Any
-from testing.mocks import mock_printer
+from testing.mocks import Any, mock_printer
 from testing.util import uncolor
 
 
@@ -190,6 +190,10 @@ def test_scan_string_cli_overrides_stdin(self):
                 }, exclude=['Db2Detector'],
             )
 
+    @pytest.mark.skipif(
+        platform.machine() not in ("x86_64", "AMD64"),
+        reason="ibm_db2 only runs on x86_64",
+    )
     def test_scan_string_cli_overrides_stdin_db2_enabled(self):
         with mock_stdin(
             '012345678ab',

tests/plugins/db2_test.py

@@ -1,15 +1,21 @@
+import platform
 import textwrap
 
 import pytest
-from mock import MagicMock
-from mock import patch
-
 from detect_secrets.core.constants import VerifiedResult
 from detect_secrets.core.potential_secret import PotentialSecret
-from detect_secrets.plugins.db2 import Db2Detector
-from detect_secrets.plugins.db2 import find_other_factor
-from detect_secrets.plugins.db2 import get_hostname_port_database_from_url
+try:
+    from detect_secrets.plugins.db2 import (
+        Db2Detector,
+        find_other_factor,
+        get_hostname_port_database_from_url,
+    )
+except ModuleNotFoundError:  # pragma: no cover
+    if platform.machine() not in ("x86_64", "AMD64"):
+        pytest.skip(reason="ibm_db2 module only runs on x86_64", allow_module_level=True)
+    raise
 
+from mock import MagicMock, patch
 
 DB2_USER = 'fake_user'
 DB2_PASSWORD = 'fake_password'