From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 1 Jul 2017 23:19:55 +0000 (+0200)
Subject: test: fix tests
X-Git-Tag: lxc-2.1.0~58^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b19d7429097bef3bd6aefc4087be9bdf4894b87;p=thirdparty%2Flxc.git

test: fix tests

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/tests/lxc-test-autostart b/src/tests/lxc-test-autostart
index 61dbdf11d..0d45bc70e 100755
--- a/src/tests/lxc-test-autostart
+++ b/src/tests/lxc-test-autostart
@@ -55,8 +55,8 @@ if [ -f /etc/lsb-release ]; then
     done
 fi
 
-lxc-create -t download -n $CONTAINER_NAME -- -d ubuntu -r $release -a $ARCH
-CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs -H))
+lxc-create -t download -n $CONTAINER_NAME -B dir -- -d ubuntu -r $release -a $ARCH
+CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs -H) | sed -e 's/dir://')
 cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak
 
 # Ensure it's not in lxc-autostart
diff --git a/src/tests/lxc-test-cloneconfig b/src/tests/lxc-test-cloneconfig
index a28d50970..5692c170b 100755
--- a/src/tests/lxc-test-cloneconfig
+++ b/src/tests/lxc-test-cloneconfig
@@ -108,8 +108,8 @@ EOF
 # Figure out container dirname
 # We need this in 5.conf
 lxc-destroy -n lxctestb || true
-lxc-create -t busybox -n lxctestb
-CONTAINER_PATH=$(dirname $(lxc-info -n lxctestb -c lxc.rootfs -H))
+lxc-create -t busybox -n lxctestb -B dir
+CONTAINER_PATH=$(dirname $(lxc-info -n lxctestb -c lxc.rootfs -H) | sed 's/dir://')
 lxc-destroy -n lxctestb
 
 # No nics, one clone hook in $container
diff --git a/src/tests/parse_config_file.c b/src/tests/parse_config_file.c
index e20272fe7..9239b42fa 100644
--- a/src/tests/parse_config_file.c
+++ b/src/tests/parse_config_file.c
@@ -524,13 +524,6 @@ int main(int argc, char *argv[])
 		goto non_test_error;
 	}
 
-	/* lxc.rootfs.backend */
-	if (set_get_compare_clear_save_load(c, "lxc.rootfs.backend", "btrfs",
-					    tmpf, true) < 0) {
-		lxc_error("%s\n", "lxc.rootfs.backend");
-		goto non_test_error;
-	}
-
 	/* REMOVE IN LXC 3.0
 	   legacy lxc.utsname key
 	 */