Merge lp:~jamesodhunt/ubuntu/raring/lxc/dep-8-tests into lp:ubuntu/raring/lxc

[James Hunt]

Basic DEP-8 tests for lxc.

Requires the fix for bug 1166870 before the tests will pass.

[Jean-Baptiste Lallement (jibel)]

Thanks for your work on this test.

There is a missing test dependency on cgroup-lite which is not installed in a minimal testing environment. With this package added the test pass.

review: Needs Fixing

[Jean-Baptiste Lallement (jibel)]

Oh, also, you should enable auto-discovery of the package by the test environment by adding:

   XS-Testsuite: autopkgtest

to the Sources paragraph in debian/control

[lp:~jamesodhunt/ubuntu/raring/lxc/dep-8-tests]

242. By James Hunt on 2013-04-12

* debian/control: Added XS-Testsuite.
* debian/tests/control: Added missing cgroup-lite dependency.

[James Hunt (jamesodhunt)]

Thanks Jibel - branch updated.

[Jean-Baptiste Lallement (jibel)]

I tried latest commit and it works fine. Thanks for the fix!

review: Approve

[lp:~jamesodhunt/ubuntu/raring/lxc/dep-8-tests]

243. By James Hunt on 2013-04-22

* debian/tests/exercise:
  - wait_for_state(): Remove and use lxc-wait!
  - Specify a distro template explicitly.

[James Hunt (jamesodhunt)]

Further updates and now submitted to Debian too: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705934

[James Hunt (jamesodhunt)]

Early feedback on bug above suggests this patch is not yet ready for Debian so please consider adding to Ubuntu until we have a version that is compatible with both debian+ubuntu so we have atleast some test coverage for the time being.

[Martin Pitt (pitti)]

This was uploaded a while ago already:

lxc (0.9.0-0ubuntu8) saucy; urgency=low

  [ James Hunt ]
  * Add basic DEP-8 tests to ensure a container can be created, started,
    stopped and cloned.

 -- James Hunt <email address hidden> Tue, 21 May 2013 14:44:12 +0100

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-08 16:20:57 +0000
+++ debian/changelog	2013-04-22 13:30:49 +0000
@@ -1,3 +1,10 @@
+lxc (0.9.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * Add basic DEP-8 tests to ensure a container can be created, started,
+    stopped and cloned.
+
+ -- James Hunt <[e-mail]>  Mon, 22 Apr 2013 14:24:15 +0100
+
 lxc (0.9.0-0ubuntu1) raring; urgency=low
 
   * New upstream release (0.9.0) (LP: #1166286)
 
=== modified file 'debian/control'
--- debian/control	2013-02-18 22:12:13 +0000
+++ debian/control	2013-04-22 13:30:49 +0000
@@ -16,6 +16,7 @@
 Standards-Version: 3.9.4
 Homepage: http://lxc.sourceforge.net/
 X-Python3-Version: >= 3.2
+XS-Testsuite: autopkgtest
 
 Package: lxc
 Architecture: linux-any
 
=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-04-22 13:30:49 +0000
@@ -0,0 +1,3 @@
+Tests: exercise
+Depends: @, cgroup-lite
+Restrictions: needs-root
 
=== added file 'debian/tests/exercise'
--- debian/tests/exercise	1970-01-01 00:00:00 +0000
+++ debian/tests/exercise	2013-04-22 13:30:49 +0000
@@ -0,0 +1,80 @@
+#!/bin/sh
+#---------------------------------------------------------------------
+# Some very basic tests to run in a DEP-8 environment.
+#---------------------------------------------------------------------
+
+template_dir=/usr/share/lxc/templates
+
+# Exit with error message.
+#
+# @msg: message to display.
+die()
+{
+    msg="$*"
+    echo "ERROR: $msg" >&2
+    exit 1
+}
+
+# seconds to wait for container to be running/stopped
+boot_secs=10
+shutdown_secs=10
+
+distro=$(lsb_release --id|cut -d: -f2-|awk '{print $1}'|tr '[A-Z]' '[a-z]')
+[ -z "$distro" ] && die "failed to determine distro"
+
+[ ! -d "$template_dir" ] && die "template directory does not exist"
+
+file=$(ls "${template_dir}/lxc-${distro}" 2>/dev/null)
+[ -z "$file" ] && die "template does not exist for distro '$distro'"
+template="$distro"
+
+release=$(lsb_release -c|awk '{print $2}')
+[ -z "$release" ] && die "failed to establish release"
+
+orig_name="${release}-dep8"
+new_name="${orig_name}-clone"
+
+name="$orig_name"
+
+# flush cache to ensure we always get the latest bootstrap image
+lxc-create -n "$name" -t "$template" -- "$release" --flush-cache || \
+    die "failed to create container '$name' using template '$template' for release '$release'"
+
+lxc-ls -1 | grep -q "^${name}$" || \
+    die "container not known"
+
+lxc-start -n "$name" --daemon || die "failed to initiate container start"
+
+lxc-wait -n "$name" -s RUNNING -t $boot_secs || \
+    die "container $name: did not start after $boot_secs seconds"
+
+lxc-stop -n "$name" || die "container $name: failed to initiate shutdown"
+
+lxc-wait -n "$name" -s STOPPED -t $shutdown_secs || \
+    die "container $name: did not stop within $shutdown_secs seconds"
+
+lxc-clone -o "$orig_name" -n "$new_name" || \
+    die "failed to clone container '$orig_name' to '$new_name'"
+
+# switch attention to the clone
+name="$new_name"
+
+lxc-start -n "$name" --daemon || die "container $name: failed to initiate start"
+
+lxc-wait -n "$name" -s RUNNING -t $boot_secs || \
+    die "container $name: did not start after $boot_secs seconds"
+
+lxc-stop -n "$name" || die "container $new_nam: failed to initiate shutdown"
+
+lxc-wait -n "$name" -s STOPPED -t $shutdown_secs || \
+    die "container $name: did not stop within $shutdown_secs seconds"
+
+# clean up
+for name in "$orig_name" "$new_name"
+do
+    lxc-destroy -n "$name" || die "container: $name: cannot delete"
+done
+
+echo SUCCESS
+
+exit 0