Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
4b19d742
Unverified
Commit
4b19d742
authored
Jul 02, 2017
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test: fix tests
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
4d463f62
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
11 deletions
+4
-11
lxc-test-autostart
src/tests/lxc-test-autostart
+2
-2
lxc-test-cloneconfig
src/tests/lxc-test-cloneconfig
+2
-2
parse_config_file.c
src/tests/parse_config_file.c
+0
-7
No files found.
src/tests/lxc-test-autostart
View file @
4b19d742
...
...
@@ -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
...
...
src/tests/lxc-test-cloneconfig
View file @
4b19d742
...
...
@@ -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
...
...
src/tests/parse_config_file.c
View file @
4b19d742
...
...
@@ -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
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment