Skip to content

test: use pwd and ls from GNU coreutils in apport-valgrind tests #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bdrung wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test: use pwd and ls from GNU coreutils in apport-valgrind tests #579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions tests/integration/test_apport_valgrind.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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]
Expand Down
Loading