diff -Nru lxc-2.0.1/debian/changelog lxc-2.0.1/debian/changelog
--- lxc-2.0.1/debian/changelog 2016-05-16 17:42:35.000000000 -0400
+++ lxc-2.0.1/debian/changelog 2016-06-23 15:42:18.000000000 -0400
@@ -1,3 +1,10 @@
+lxc (2.0.1-0ubuntu2) yakkety; urgency=medium
+
+ * On yakkety, skip the lxc-test-ubuntu test as it requires root.tar.xz
+ images to be available over simplestreams which don't exist anymore.
+
+ -- Stéphane Graber <stgraber@ubuntu.com> Thu, 23 Jun 2016 15:41:40 -0400
+
lxc (2.0.1-0ubuntu1) yakkety; urgency=medium
* New upstream bugfix release (2.0.1)
diff -Nru lxc-2.0.1/debian/tests/exercise lxc-2.0.1/debian/tests/exercise
--- lxc-2.0.1/debian/tests/exercise 2016-05-16 17:37:24.000000000 -0400
+++ lxc-2.0.1/debian/tests/exercise 2016-06-23 15:41:05.000000000 -0400
@@ -44,6 +44,9 @@
echo "SUMMARY: pass=$TEST_PASS, fail=$TEST_FAIL, ignored=$TEST_IGNORED"
}
+# Source distro information
+[ -e /etc/lsb-release ] && . /etc/lsb-release
+
# The actual tests
## Default testsuite
for testbin in /usr/bin/lxc-test-*; do
@@ -53,6 +56,12 @@
# Some tests can't be run standalone
[ "$testbin" = "/usr/bin/lxc-test-may-control" ] && continue
+ # Skip ubuntu tests on yakkety
+ if [ "${DISTRIB_CODENAME}" = "yakkety" ]; then
+ [ "$testbin" = "/usr/bin/lxc-test-ubuntu" ] && \
+ ignore "$STRING" && continue
+ fi
+
# Skip some tests when running in a container
if [ -f /run/container_type ] || (type systemd-detect-virt >/dev/null 2>&1 && systemd-detect-virt --container >/dev/null 2>&1); then
[ "$testbin" = "/usr/bin/lxc-test-apparmor" ] && \