diff --git a/tests/integration/test_apport_valgrind.py b/tests/integration/test_apport_valgrind.py index 70ab74721..90a6d3165 100644 --- a/tests/integration/test_apport_valgrind.py +++ b/tests/integration/test_apport_valgrind.py @@ -15,7 +15,7 @@ import tempfile import unittest -from tests.helper import skip_if_command_is_missing +from tests.helper import get_gnu_coreutils_cmd, skip_if_command_is_missing from tests.paths import local_test_environment @@ -43,7 +43,12 @@ def tearDown(self) -> None: def test_valgrind_min_installed(self) -> None: """Valgrind is installed and recent enough.""" - cmd = ["valgrind", "-q", "--extra-debuginfo-path=./", "ls"] + cmd = [ + "valgrind", + "-q", + "--extra-debuginfo-path=./", + get_gnu_coreutils_cmd("ls"), + ] ret, out, err = self._call(cmd) self.assertEqual(err, "") self.assertEqual(ret, 0) @@ -70,7 +75,7 @@ def test_help_display(self) -> None: def test_invalid_args(self) -> None: """Return code is not 0 when invalid args are passed.""" - cmd = ["apport-valgrind", "-k", "pwd"] + cmd = ["apport-valgrind", "-k", get_gnu_coreutils_cmd("pwd")] ret, out, err = self._call(cmd) self.assertEqual(out, "") self.assertNotEqual(ret, 0) @@ -144,7 +149,7 @@ def test_intentional_mem_leak_detection(self) -> None: def test_unpackaged_exe(self) -> None: """apport-valgrind creates valgrind log on unpackaged executable.""" exepath = os.path.join(self.workdir, "pwd") - shutil.copy("/bin/pwd", exepath) + shutil.copy(get_gnu_coreutils_cmd("pwd"), exepath) logpath = os.path.join(self.workdir, "unpackaged-exe.log") cmd = ["apport-valgrind", "--no-sandbox", "-l", logpath, exepath]