diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2015-11-23 04:36:39 +0000 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2015-11-24 14:33:16 +0000 |
| commit | 2c393ed7611a586ef5665aa62453ec57c0f5fef6 (patch) | |
| tree | 8adababaa99ef7ca4bd068a3fb8bdf6789e34891 | |
| parent | 8c191eecd403e1759789b70fb0b7283fd22c2b32 (diff) | |
tests: don't rely on system's machined
Fixes backward/forward incompatibility errors on spawning.
For example:
$ sudo make run
...
Failed to register machine: Cannot set property TasksMax, or unknown
property.
$ ../../systemd-nspawn --version
systemd 228
$ systemd-nspawn --version
systemd 225
| -rw-r--r-- | test/test-functions | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/test-functions b/test/test-functions index fca163a979..a5644eaf73 100644 --- a/test/test-functions +++ b/test/test-functions @@ -92,7 +92,7 @@ $KERNEL_APPEND \ run_nspawn() { set -x - ../../systemd-nspawn --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND + ../../systemd-nspawn --register=no --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND } setup_basic_environment() { @@ -1135,8 +1135,7 @@ inst_libdir_file() { check_nspawn() { [[ -d /sys/fs/cgroup/systemd ]] && \ - [[ -d /run/systemd/system ]] && \ - [[ -e /lib/systemd/systemd-machined ]] + [[ -d /run/systemd/system ]] } |