From e97ae272feafb23cd50623d3a0654967d80aa8f6 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Thu, 8 Aug 2024 07:39:14 -0600 Subject: [PATCH] further debug --- tests/support/pkg.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/support/pkg.py b/tests/support/pkg.py index 7b6c18ae598..c86c8385295 100644 --- a/tests/support/pkg.py +++ b/tests/support/pkg.py @@ -31,6 +31,7 @@ from saltfactories.daemons import api, master, minion from saltfactories.utils import cli_scripts import salt.utils.files +import salt.utils.platform as dgm_platform from tests.conftest import CODE_DIR from tests.support.pytest.helpers import TestAccount @@ -837,9 +838,9 @@ class SaltPkgInstall: self._install_ssm_service() elif platform.is_darwin(): - if relenv and platform.is_arm64(): + if relenv and dgm_platform.is_arm64(): arch = "arm64" - elif platform.is_arm64() and self.classic: + elif dgm_platform.is_arm64() and self.classic: arch = "arm64" else: arch = "x86_64" @@ -862,7 +863,7 @@ class SaltPkgInstall: dgm_relenv = False print( - f"DGM test/support/pkg for darwin, machine string '{platform.dgm_machine()}'", + f"DGM test/support/pkg for darwin, machine string '{dgm_platform.dgm_machine()}'", flush=True, ) print(