Merge lp:~serge-hallyn/ubuntu-test-cases/server-lxc2 into lp:ubuntu-test-cases/server

[Serge Hallyn]

This commit will make debugging lxc testcase failures easier to debug, and *should* fix bug 1130029.

(Note - this replaces the mp for lp:~serge-hallyn/ubuntu-test-cases/server-lxc-fixapi)

[lp:~serge-hallyn/ubuntu-test-cases/server-lxc2]

80. By Serge Hallyn on 2013-02-26

don't set config to a nonexisting file by default

(no effect, since we explicitly pass in NULL)

81. By Serge Hallyn on 2013-02-26

fix syntax error (double commas)

[Stéphane Graber (stgraber)]

I'm not seeing anything obviously wrong, just a few notes:
 - I just sent a patch upstream to drop the need for autoconf pre-processing of api_test.py which should let you drop the extra build from the test.
 - Might be worth running pyflakes and pep8 against all the python scripts, I noticed some things that aren't PEP-8 compliant.
 - When installing lxc in the container, you can easily avoid the policy-rc.d + rm by simply creating /etc/init/lxc.override with "manual" as content before installing lxc. This will prevent upstart from starting the lxc job and any job depending on it.

[Paul Larson (pwlars)]

+1

review: Approve

[Serge Hallyn (serge-hallyn)]

Quoting Stéphane Graber (<email address hidden>):
> I'm not seeing anything obviously wrong, just a few notes:
> - I just sent a patch upstream to drop the need for autoconf pre-processing of api_test.py which should let you drop the extra build from the test.

Unfortunately that isn't yet in our package :) But I've left a comment
to remind us of that.

> - Might be worth running pyflakes and pep8 against all the python scripts, I noticed some things that aren't PEP-8 compliant.
> - When installing lxc in the container, you can easily avoid the policy-rc.d + rm by simply creating /etc/init/lxc.override with "manual" as content before installing lxc. This will prevent upstart from starting the lxc job and any job depending on it.

Awesome, that leaves PkgSetup() looking much nicer, thanks.

-serge

=== modified file 'testsuites/lxc/test_lxc_api/test.sh'
--- testsuites/lxc/test_lxc_api/test.sh	2012-09-14 13:40:31 +0000
+++ testsuites/lxc/test_lxc_api/test.sh	2013-02-26 15:22:51 +0000
@@ -22,20 +22,22 @@
 
 set -e
 
-echo "pwd" > /tmp/debug
-pwd >> /tmp/debug
-echo "id" >> /tmp/debug
-id >> /tmp/debug
-echo "/proc/self/status" >> /tmp/debug
-cat /proc/self/status >> /tmp/debug
-echo "ls /" >> /tmp/debug
-ls / >> /tmp/debug
-echo "ls /proc" >> /tmp/debug
-ls /proc >> /tmp/debug
-echo "I am $$" >> /tmp/debug
+echo "pwd"
+pwd
+echo "id"
+id
+echo "/proc/self/status"
+cat /proc/self/status
+echo "ls /"
+ls /
+echo "ls /proc"
+ls /proc
+echo "I am $$"
 
 rm -rf lxc
 bzr branch ubuntu:lxc
-python3 lxc/src/python-lxc/examples/api_test.py > /tmp/apiout 2>&1
+cd lxc
+debian/rules build
+python3 src/python-lxc/examples/api_test.py
 
 exit 0
 
=== modified file 'testsuites/lxc/test_lxc_apparmor/lxctest.py'
--- testsuites/lxc/test_lxc_apparmor/lxctest.py	2012-09-14 13:40:31 +0000
+++ testsuites/lxc/test_lxc_apparmor/lxctest.py	2013-02-26 15:22:51 +0000
@@ -7,7 +7,7 @@
 # sudo apt-get -y install lxc libvirt-bin make gcc
 
 class Lxc:
-    def __init__(self, template="ubuntu", relnum = "12.04", release=None, config = "/etc/lxc-test.conf", name=None):
+    def __init__(self, template="ubuntu", relnum = "12.04", release=None, config=None, name=None):
         self.name = name
         if not name:
             if release:
 
=== modified file 'testsuites/lxc/test_lxc_reboot/test.sh'
--- testsuites/lxc/test_lxc_reboot/test.sh	2012-09-14 13:40:31 +0000
+++ testsuites/lxc/test_lxc_reboot/test.sh	2013-02-26 15:22:51 +0000
@@ -23,6 +23,6 @@
 set -e
 
 make reboot-test
-./reboot-test > /tmp/rebootout 2>&1
+./reboot-test
 
 exit 0
 
=== modified file 'testsuites/lxc/test_lxc_simple/lxctest.py'
--- testsuites/lxc/test_lxc_simple/lxctest.py	2012-09-14 13:40:31 +0000
+++ testsuites/lxc/test_lxc_simple/lxctest.py	2013-02-26 15:22:51 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 import unittest, subprocess, sys
 import platform, os, shutil
 import time
@@ -7,7 +9,7 @@
 # sudo apt-get -y install lxc libvirt-bin make gcc
 
 class Lxc:
-    def __init__(self, template="ubuntu", relnum = "12.04", release=None, config = "/etc/lxc-test.conf", name=None):
+    def __init__(self, template="ubuntu", relnum = "12.04", release=None, config=None, name=None):
         self.name = name
         if not name:
             if release:
@@ -54,35 +56,31 @@
         if ret != 0:
             raise ValueError, "Failed apt-get update in container %s" % (self.name)
 
-        cmd = ["chroot", rootpath, "apt-get", "-y", "install", "libcap2"]
-        ret = subprocess.call(cmd, stdout=None, stderr=None)
-        if ret != 0:
-            raise ValueError, "Failed installing libcap2 in container %s" % (self.name)
-        cmd = ["chroot", rootpath, "apt-get", "-y", "install", "--download-only", "lxc"]
-        ret = subprocess.call(cmd, stdout=None, stderr=None)
-        if ret != 0:
-            raise ValueError, "Failed downloading lxc in container %s" % (self.name)
-
-        cmd = ["chroot", rootpath, "apt-get", "-y", "install", "libapparmor1"]
-        ret = subprocess.call(cmd, stdout=None, stderr=None)
-        if ret != 0:
-            raise ValueError, "Failed installing libapparmor1 in container %s" % (self.name)
-
-        # extract lxc package into container's /tmp
-        pkgpath = "%s/var/cache/apt/archives/lxc_*" % (rootpath)
-        tmppath = "%s/tmp" % (rootpath)
-        cmd = "dpkg -x %s %s" % (pkgpath, tmppath)
-        ret = subprocess.call(cmd, shell=True, stdout=None, stderr=None)
-        if ret != 0:
-            raise ValueError, "Failed extracting lxc in container %s" % (self.name)
-
-        # copying /usr/lib/lxc into container
-        srcpath = "%s/usr/lib/lxc" % (tmppath)
-        destpath = "%s/usr/lib" % (rootpath)
-        cmd = ["cp", "-a", srcpath, destpath]
-        ret = subprocess.call(cmd, stdout=None, stderr=None)
-        if ret != 0:
-            raise ValueError, "Failed copying lxc package contents in container %s" % (self.name)
+        updatetxt='''#!/bin/sh
+exit 101
+'''
+        f=open("/var/lib/lxc/%s/rootfs/usr/sbin/policy-rc.d" % (self.name), "w")
+        f.write(updatetxt)
+        f.close()
+        cmd = ["chmod", "+x", "/var/lib/lxc/%s/rootfs/usr/sbin/policy-rc.d" % (self.name)]
+        ret = subprocess.call(cmd, stdout=None, stderr=None)
+        if ret != 0:
+            raise ValueError, "Failed to make policy-rc.d +x in container %s" % (self.name)
+
+        cmd = ["chroot", rootpath, "apt-get", "-y", "install", "--no-install-recommends", "lxc"]
+        ret = subprocess.call(cmd, stdout=None, stderr=None)
+        if ret != 0:
+            raise ValueError, "Failed installing lxc in container %s" % (self.name)
+
+        cmd = ["rm", "-f", "/var/lib/lxc/%s/rootfs/etc/init/lxc*" % (self.name)]
+        ret = subprocess.call(cmd, stdout=None, stderr=None)
+        if ret != 0:
+            raise ValueError, "Failed removing /etc/init/lxc* in container %s" % (self.name)
+
+        cmd = ["rm", "-f", "/var/lib/lxc/%s/rootfs/usr/sbin/policy-rc.d" % (self.name)]
+        ret = subprocess.call(cmd, stdout=None, stderr=None)
+        if ret != 0:
+            raise ValueError, "Failed removing policy-rc.d in container %s" % (self.name)
 
     def Execute(self, program="/bin/true"):
         cmd = ["lxc-execute", "-n", self.name, "--", program]
@@ -155,32 +153,17 @@
         elif self.arch == "armv7l":
             self.arch="armel"
 
-        if self.arch == "armel":
-            self.tests = [["ubuntu", 11.10, "oneiric"],
-                          ["ubuntu", 12.04, "precise"]]
-        elif self.arch == "armhf":
-            self.tests = [["ubuntu", 12.04, "precise"]]
+        if self.arch == "armel" or self.arch == "armhf":
+            self.tests = [["ubuntu", 12.04, "precise"],
+                          ["ubuntu", 13.04, "raring"]]
         else:
             self.tests = [["ubuntu", 8.04, "lucid"],
-                          ["ubuntu", 11.10, "oneiric"],
                           ["ubuntu", 12.04, "precise"],
-                          ["ubuntu-cloud", 8.04, "lucid"],
-                          ["ubuntu-cloud", 11.10, "oneiric"],
-                          ["ubuntu-cloud", 12.04, "precise"],
+                          ["ubuntu", 13.04, "raring"],
+                          #["ubuntu-cloud", 8.04, "lucid"],
+                          #["ubuntu-cloud", 12.04, "precise"],
                           ]
 
-        lxctestconf = '''
-lxc.network.type=veth
-lxc.network.link=virbr0
-lxc.network.flags=up
-'''
-        f = open("/etc/lxc-test.conf", "w")
-        f.write(lxctestconf)
-        f.close()
-
-    def tearDown(self):
-        os.remove("/etc/lxc-test.conf")
-
     def runTest(self):
         for (t,relnum,r) in self.tests:
             try:
@@ -280,8 +263,6 @@
             self.assertTrue(False, "Failed at container autostart test %s\nError: %s" % (test, e))
 
 if __name__ == '__main__':
-    # set keepcache true if you're developing and want to save some time...
-    keepcache=False
     # check for uid 0
     uid = os.getuid()
     if uid != 0:
@@ -295,7 +276,7 @@
         sys.exit(1)
 
     # make sure the needed prereqs are installed
-    cmd = ["sudo", "apt-get", "-y", "install", "lxc", "libvirt-bin", "make", "gcc"]
+    cmd = ["sudo", "apt-get", "-y", "install", "lxc", "make", "gcc"]
     if dist[1] >= 12.10:
         cmd += [ "bzr", "python3-lxc" ]
 
@@ -305,23 +286,13 @@
         sys.exit(1)
 
     # apt-get install -y cgroup-lite libvirt-bin lxc lsb-release make gcc
-    if dist[1] < 11.10:
-        print >>sys.stderr, "testsuite only supported on oneiric and precise"
+    if dist[1] < 12.04:
+        print >>sys.stderr, "testsuite only supported on precise and later"
         sys.exit(1)
 
     suite = unittest.TestSuite()
 
     suite.addTest(SimpleLxcTests())
-    if not keepcache:
-        suite.addTest(SimpleLxcTests())
-
-    # clear the caches for the first run.  we'll do two runs
-    if not keepcache:
-        try:
-            shutil.rmtree("/var/cache/lxc")
-            os.mkdir("/var/cache/lxc", 0755)
-        except:
-            pass
 
     rc = unittest.TextTestRunner(verbosity=2).run(suite)
 
 
=== modified file 'testsuites/lxc/test_lxc_simple/test.sh'
--- testsuites/lxc/test_lxc_simple/test.sh	2012-09-14 17:50:59 +0000
+++ testsuites/lxc/test_lxc_simple/test.sh	2013-02-26 15:22:51 +0000
@@ -2,6 +2,6 @@
 
 set -e
 
-python lxctest.py > /tmp/simpleout 2>&1
+python lxctest.py
 
 exit 0
 
=== modified file 'testsuites/lxc/tsetup/setup.sh'
--- testsuites/lxc/tsetup/setup.sh	2012-09-14 13:40:31 +0000
+++ testsuites/lxc/tsetup/setup.sh	2013-02-26 15:22:51 +0000
@@ -19,7 +19,9 @@
 # <http://www.gnu.org/licenses/>.
 # 
 
-bzr branch lp:~serge-hallyn/+junk/lxc-test
+# not needed - that suite is copied here in parts.
+#bzr branch lp:~serge-hallyn/+junk/lxc-test
 sudo apt-get -y --force-yes install lxc make gcc bzr python3-lxc
+sudo apt-get -y build-dep lxc
 rm -rf /var/cache/lxc || true
 mkdir -p /var/cache/lxc