From 2c393ed7611a586ef5665aa62453ec57c0f5fef6 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Mon, 23 Nov 2015 04:36:39 +0000
Subject: 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
---
 test/test-functions | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'test/test-functions')

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 ]]
 }
 
 
-- 
cgit v1.2.3-54-g00ecf