diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-11-19 14:39:18 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-11-19 17:14:44 +0100 |
| commit | 3f5c306d3810673364f8eae662f3735ffd645a1d (patch) | |
| tree | b6945601fab66aced3ad091cd8cd0e480f3abc3f | |
| parent | dbf43a42b8bb66d53c7cbab05f104c28097f811e (diff) | |
test: disable nspawn checks if machine wasn't booted with systemd
Sempaphore containers are not booted with systemd, so machined is not
available, which makes nspawn bail. Just skip nspawn tests in such
environments.
[ -d /run/systemd/system ] is esentially what sd_booted(3) is doing,
but on Ubuntu 15.05, without 'systemd-container' installed, we also
need to check for the presence of the systemd-machined binary.
| -rw-r--r-- | test/test-functions | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index 5d223dbc63..f8f89996b4 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1131,7 +1131,9 @@ inst_libdir_file() { } check_nspawn() { - [[ -d /sys/fs/cgroup/systemd ]] + [[ -d /sys/fs/cgroup/systemd ]] && \ + [[ -d /run/systemd/system ]] && \ + [[ -e /lib/systemd/systemd-machined ]] } |