test: drop the testutils fork, use mender-server's

This repo carried a fork of mender-server's testutils, 12 of 36 files
diverged. Roughly a third of that was genuine fixes that upstream never
got; the rest was this repo's own compose setups sitting in a directory
that shadowed upstream's.

The fixes are now upstream in mender-server#2146, so the fork is deleted
and testutils comes from the submodule. conftest puts it on sys.path and
sets GATEWAY_HOSTNAME, which upstream defaults to "traefik" and this suite
needs as "docker.mender.io".

What stays is tests/container_manager/: the compose setups encode which
files this suite runs, tests/compose/*.yml rather than mender-server's,
and the class set differs from upstream's in both directions. requests_get
moves to MenderAPI/requests_helpers.py, the one common.py helper upstream
does not have.

Do not merge before mender-server#2146. The submodule is pinned to that
PR's head; it needs re-pinning to main once that lands.

Ticket: QA-1702
Signed-off-by: Rewan Rashid <rewan.rashid@northern.tech>

Author: rewanrashid-boop

tests/MenderAPI/requests_helpers.py

@@ -41,3 +41,14 @@ def requests_retry(status_forcelist=[500, 502, 503, 504], host=GATEWAY_HOSTNAME)
     if host:
         s.headers.update({"Host": host})
     return s
+
+
+def requests_get(url):
+    """Plain GET that raises on a non-2xx.
+
+    Moved here when this repo stopped forking mender-server's testutils; it was
+    the one helper in that fork's common.py which upstream does not have.
+    """
+    req = requests.get(url, timeout=30)
+    req.raise_for_status()
+    return req

tests/common_setup.py

@@ -23,7 +23,7 @@
 from testutils.common import User, new_tenant_client
 from testutils.infra.cli import CliTenantadm
 from testutils.infra.device import MenderDevice, MenderDeviceGroup
-from testutils.infra.container_manager import factory
+from .container_manager import factory
 
 container_factory = factory.get_factory()
 

tests/conftest.py

@@ -17,11 +17,28 @@
 import re
 import subprocess
 import shutil
+import sys
 import tempfile
 import packaging.version
 
 import multiprocessing
 
+# testutils comes from the mender-server submodule -- this repo no longer keeps a
+# fork of it. Both of these have to happen before the first testutils import
+# below: the path so it resolves at all, and the hostname because
+# testutils.api.client reads it into a module-level constant at import time.
+#
+# Traefik's routers match on Host as well as path, and the tests address the
+# ingress by container IP, so every request has to carry this. Upstream defaults
+# it to "traefik", which is the name its own deployments answer to.
+sys.path.insert(
+    0,
+    os.path.join(
+        os.path.dirname(os.path.abspath(__file__)), "mender_server", "backend", "tests"
+    ),
+)
+os.environ.setdefault("GATEWAY_HOSTNAME", "docker.mender.io")
+
 import filelock
 import pytest
 from filelock import FileLock

testutils/api/devicemonitor.py tests/container_manager/__init__.pytestutils/api/devicemonitor.py renamed to tests/container_manager/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2021 Northern.tech AS
+# Copyright 2026 Northern.tech AS
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -11,12 +11,10 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
+"""Compose setups specific to this repository.
 
-HOST = "mender-devicemonitor:8080"
-
-URL_DEVICES = "/api/devices/v1/devicemonitor"
-URL_INTERNAL = "/api/internal/v1/devicemonitor"
-URL_MGMT = "/api/management/v1/devicemonitor"
-
-URL_ALERT = "/alert"
-URL_DEVICE_ALERTS = lambda device_id: f"/devices/{id}/alerts".format(id=device_id)
+These used to live under a fork of mender-server's testutils. They stayed behind
+when that fork was dropped because they encode which compose files this suite
+runs -- tests/compose/*.yml -- rather than mender-server's own, and the class set
+differs from upstream's in both directions.
+"""

…r_manager/docker_compose_base_manager.py …r_manager/docker_compose_base_manager.pytestutils/infra/container_manager/docker_compose_base_manager.py renamed to tests/container_manager/docker_compose_base_manager.py testutils/infra/container_manager/docker_compose_base_manager.py renamed to tests/container_manager/docker_compose_base_manager.py

@@ -24,8 +24,8 @@
 import requests
 from urllib3.exceptions import InsecureRequestWarning
 
-from .docker_manager import DockerNamespace
-from ...api.client import GATEWAY_HOSTNAME as _GATEWAY_HOSTNAME
+from testutils.infra.container_manager.docker_manager import DockerNamespace
+from testutils.api.client import GATEWAY_HOSTNAME as _GATEWAY_HOSTNAME
 
 logger = logging.getLogger("root")
 
@@ -34,11 +34,17 @@
 
 
 class DockerComposeBaseNamespace(DockerNamespace):
+    # Repo root: this module lives at tests/container_manager/, so two levels up.
     COMPOSE_FILES_PATH = os.path.realpath(
-        os.path.join(os.path.dirname(__file__), "..", "..", "..")
+        os.path.join(os.path.dirname(__file__), "..", "..")
     )
     BASE_FILES = []
 
+    # How long 'up --wait' is given for every container to report healthy. Used
+    # to live on testutils' BaseContainerManagerNamespace, which this repo no
+    # longer forks.
+    wait_healthy_timeout = 300
+
     # Traefik routes on the Host header and we address it by container IP, so
     # every request has to carry this explicitly. Single source of truth lives in
     # testutils.api.client; exposed here so callers holding a container manager
@@ -217,8 +223,8 @@ def restart_service(self, service):
         # stack, which is already running.
         self._docker_compose_up(f"--scale {service}=1 {service}", wait_ready=False)
 
-    def get_file(self, container_name, path):
-        container_id = super().getid([container_name])
+    def get_file(self, service, path):
+        container_id = super().getid(service)
         return super().execute(container_id, ["cat", path])
 
     def _debug_log_containers_logs(self):

…tainer_manager/docker_compose_manager.py …tainer_manager/docker_compose_manager.pytestutils/infra/container_manager/docker_compose_manager.py renamed to tests/container_manager/docker_compose_manager.py testutils/infra/container_manager/docker_compose_manager.py renamed to tests/container_manager/docker_compose_manager.py

@@ -26,7 +26,7 @@
 from .common_update import common_update_procedure
 from ..MenderAPI import DeviceAuthV2, Deployments, logger
 from .mendertesting import MenderTesting
-from testutils.common import requests_get
+from ..MenderAPI.requests_helpers import requests_get
 
 
 @pytest.fixture(scope="session")

…utils/infra/container_manager/factory.py tests/container_manager/factory.pytestutils/infra/container_manager/factory.py renamed to tests/container_manager/factory.py testutils/infra/container_manager/factory.py renamed to tests/container_manager/factory.py

@@ -49,7 +49,7 @@
 from .common_connect import prepare_env_for_connect, wait_for_connect
 from .common import md5sum
 from .mendertesting import MenderTesting
-from testutils.infra.container_manager import factory
+from ..container_manager import factory
 from testutils.infra.device import MenderDevice
 
 container_factory = factory.get_factory()