Skip to content

ENT-12619: Suppress stderr from expected-failure commands #2113

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

Merged
larsewi merged 1 commit into from
Feb 13, 2026
Merged

ENT-12619: Suppress stderr from expected-failure commands #2113

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions build-scripts/prepare-testmachine-chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ CHROOT_ROOT=$HOME/testmachine-chroot/
sudo mkdir -p "$CHROOT_ROOT"

# Clean up previous chroot state by killing any processes that are using the CHROOT_ROOT directory.
sudo "$FUSER" -k "$CHROOT_ROOT" || true
sudo "$FUSER" -k "$CHROOT_ROOT" >/dev/null 2>&1 || true
# Unmount the /proc filesystem if it was previously mounted inside the chroot.
sudo umount "${CHROOT_ROOT}proc" || true
sudo umount "${CHROOT_ROOT}proc" >/dev/null 2>&1 || true

# Tell rsync not to touch the BASEDIR and PREFIX directories
echo "P $BASEDIR" >"$TRANSFER_SCRIPT"
Expand Down
6 changes: 3 additions & 3 deletions build-scripts/test-on-testmachine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@ chroot)
# Minilogd may sometimes launch on RedHat without any user
# intervention. Ignore that.
# shellcheck disable=SC2009
if ps -ef | grep -E "^ *[^ ]+ +$pid" | grep minilogd; then
if ps -ef 2>/dev/null | grep -E "^ *[^ ]+ +$pid" | grep -q minilogd; then
continue
fi
;;
suse)

# gpg-agent sometimes is spawned on suse during our tests.
# This happens only in chroot. Ignore that.
if ps -o command --pid "$pid" | grep "gpg-agent --homedir /var/tmp/zypp.*zypp-trusted.*--daemon"; then
if ps -o command --pid "$pid" 2>/dev/null | grep -q "gpg-agent --homedir /var/tmp/zypp.*zypp-trusted.*--daemon"; then
continue
fi
;;
ubuntu)
# gpg-agent sometimes is spawned on Ubuntu 24 during our tests.
# This happens only in chroot. Ignore that.
if [ "$OS_VERSION_MAJOR" = "24" ]; then
if ps -o command --pid "$pid" | grep "gpg-agent --homedir /etc/apt/sources.list.d/.gnupg-temp --use-standard-socket --daemon"; then
if ps -o command --pid "$pid" 2>/dev/null | grep -q "gpg-agent --homedir /etc/apt/sources.list.d/.gnupg-temp --use-standard-socket --daemon"; then
continue
fi
fi
Expand Down