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 61dbdf11d0cc5255c6c22f68eb992ddf13bca78b..0d45bc70e9bab18dd99060b2f96b39886d37ac79 100755 (executable)
--- 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 a28d50970ab8bd24f0ddc7c1df56d71d382bfe06..5692c170b0a70d4748f81e00c327f7d9ecf44f2d 100755 (executable)
--- 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 e20272fe7ac6efd8bad7b958e62fd9803f333d86..9239b42fa5355e11c928d8667c37f3a559077241 100644 (file)
--- 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
         */