From 7721c9db08e55e2a9dcb67be4974286ec23a8b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Tue, 16 Aug 2022 12:07:48 +0200 Subject: [PATCH] nixos/test: Remove workaround for broken nscd --- nixos/tests/systemd-machinectl.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix index 57ef95c2725f..5c7926e24abf 100644 --- a/nixos/tests/systemd-machinectl.nix +++ b/nixos/tests/systemd-machinectl.nix @@ -62,16 +62,11 @@ import ./make-test-python.nix ( # Test nss_mymachines without nscd machine.succeed('LD_LIBRARY_PATH="/run/current-system/sw/lib" getent -s hosts:mymachines hosts ${containerName}'); - # Test failing nss_mymachines via nscd - # nscd has not enough rights to connect to systemd bus - # via sd_bus_open_system() in - # https://github.com/systemd/systemd/blob/main/src/nss-mymachines/nss-mymachines.c#L287 - machine.fail("getent hosts ${containerName}"); + # Test nss_mymachines via nscd + machine.succeed("getent hosts ${containerName}"); # Test systemd-nspawn network configuration - machine.succeed("systemctl stop nscd"); - machine.succeed('LD_LIBRARY_PATH="/run/current-system/sw/lib" ping -n -c 1 ${containerName}'); - machine.succeed("systemctl start nscd"); + machine.succeed("ping -n -c 1 ${containerName}"); # Test systemd-nspawn uses a user namespace machine.succeed("test $(machinectl status ${containerName} | grep 'UID Shift: ' | wc -l) = 1")