The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/4893
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
From d5e99058c559144d7b0484ba589954515bfb4c3f Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Thu, 9 Aug 2018 11:07:22 +0200
Subject: [PATCH] lxc-to-lxd: Fix rootfs tests
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
lxc-to-lxd/main_migrate_test.go | 29 ++++-------------------------
1 file changed, 4 insertions(+), 25 deletions(-)
diff --git a/lxc-to-lxd/main_migrate_test.go b/lxc-to-lxd/main_migrate_test.go
index 78e5cc0d24..bb7106f384 100644
--- a/lxc-to-lxd/main_migrate_test.go
+++ b/lxc-to-lxd/main_migrate_test.go
@@ -81,17 +81,6 @@ func TestValidateConfig(t *testing.T) {
"Invalid container, missing lxc.rootfs key",
true,
},
- {
- "invalid lxc.rootfs key",
- []string{
- "lxc.uts.name = c1",
- "lxc.apparmor.allow_incomplete = 0",
- "lxc.autodev = 1",
- "lxc.rootfs = /invalid/path",
- },
- "Invalid container, invalid lxc.rootfs key",
- true,
- },
{
"non-existent rootfs path",
[]string{
@@ -268,16 +257,6 @@ func TestConvertStorageConfig(t *testing.T) {
"Invalid path: /foo",
true,
},
- {
- "invalid rootfs",
- []string{
- "lxc.rootfs.path = /invalid",
- "lxc.mount.entry = /lib /lib none ro,bind 0 0",
- },
- types.Devices{},
- "Invalid container, invalid lxc.rootfs key",
- true,
- },
{
"ignored default mounts",
[]string{
@@ -373,16 +352,16 @@ func TestGetRootfs(t *testing.T) {
true,
},
{
- "invalid lxc.rootfs key",
+ "valid lxc.rootfs key (1)",
[]string{
"lxc.rootfs = foobar",
},
+ "foobar",
"",
- "Invalid container, invalid lxc.rootfs key",
- true,
+ false,
},
{
- "valid lxc.rootfs key",
+ "valid lxc.rootfs key (2)",
[]string{
"lxc.rootfs = dir:foobar",
},
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
