Merge lp:~jibel/update-manager/AutoUpgradeTester-debconf into lp:update-manager

[Jean-Baptiste Lallement]

=== modified file 'AutoUpgradeTester/UpgradeTestBackend.py'
--- AutoUpgradeTester/UpgradeTestBackend.py	2012-01-10 10:13:39 +0000
+++ AutoUpgradeTester/UpgradeTestBackend.py	2012-01-18 14:54:29 +0000
@@ -138,7 +138,6 @@
         output = ""
         testsuite_name = ''
         res = [x['result'] for x in results]
-        #pass_count = res.count('pass')
         fail_count = res.count('fail')
         error_count = res.count('error')
         total_count = len(res)
@@ -149,7 +148,8 @@
 
         for result in results:
             output += """<testcase classname="%s" name="%s" time="%.3f">\n""" % (
-                self.profilename, result['name'], result['time'])
+                self.profilename + '.PostUpgradeTest',
+                result['name'][:-3], result['time'])
             if 'fail' in result['result']:
                 output += """<failure type="%s">%s\n</failure>\n""" % (
                     'exception', escape(result['message']))

=== modified file 'AutoUpgradeTester/UpgradeTestBackendQemu.py'
--- AutoUpgradeTester/UpgradeTestBackendQemu.py	2012-01-05 08:25:38 +0000
+++ AutoUpgradeTester/UpgradeTestBackendQemu.py	2012-01-18 14:54:29 +0000
@@ -463,7 +463,7 @@
                     entry.type == "deb"):
                     print "adding %s to mirrors" % entry.uri
                     self._runInImage(["echo '%s' >> /upgrade-tester/new_mirrors.cfg" % entry.uri])
-                    
+
             # upgrade *before* the regular upgrade runs 
             if self.config.getWithDefault("NonInteractive", "AddRepoUpgradeImmediately", False):
                 self._runInImage(["apt-get", "update"])
@@ -477,12 +477,17 @@
         # check if we have a bzr checkout dir to run against or
         # if we should just run the normal upgrader
         cmd_prefix=[]
+        debconf_log = self.config.getWithDefault(
+            'NonInteractive', 'DebconfLog', '')
+        if debconf_log:
+            cmd_prefix=['export DEBIAN_FRONTEND=editor EDITOR="cat>>%s";' % debconf_log]
+            print "Logging debconf prompts to %s" % debconf_log
         if not self.config.getWithDefault("NonInteractive","ForceOverwrite", False):
             print "Disabling ForceOverwrite"
-            cmd_prefix = ["export RELEASE_UPGRADE_NO_FORCE_OVERWRITE=1;"]
+            cmd_prefix += ["export RELEASE_UPGRADE_NO_FORCE_OVERWRITE=1;"]
         if (os.path.exists(self.upgradefilesdir) and
-            self.config.getWithDefault("NonInteractive", 
-                                       "UseUpgraderFromBzr", 
+            self.config.getWithDefault("NonInteractive",
+                                       "UseUpgraderFromBzr",
                                        True)):
             print "Using ./DistUpgrade/* for the upgrade"
             self._copyUpgraderFilesFromBzrCheckout()

=== modified file 'AutoUpgradeTester/UpgradeTestBackendSSH.py'
--- AutoUpgradeTester/UpgradeTestBackendSSH.py	2011-12-12 14:37:37 +0000
+++ AutoUpgradeTester/UpgradeTestBackendSSH.py	2012-01-18 14:54:29 +0000
@@ -206,6 +206,8 @@
 
         # check for conffiles (the copy is done via a post upgrade script)
         self._copyFromImage("/tmp/*.dpkg-dist", self.resultdir)
+        # Collect debconf prompts generated by debconf_test.py script
+        self._copyFromImage("/tmp/debconf_*.log", self.resultdir)
         self.resultsToJunitXML(results, os.path.join(self.resultdir, 'results.xml'))
 
         self.stop()

=== added file 'AutoUpgradeTester/post_upgrade_tests/debconf_test.py'
--- AutoUpgradeTester/post_upgrade_tests/debconf_test.py	1970-01-01 00:00:00 +0000
+++ AutoUpgradeTester/post_upgrade_tests/debconf_test.py	2012-01-18 14:54:29 +0000
@@ -0,0 +1,63 @@
+#!/usr/bin/python
+"""
+Parse debconf log file and split in a file per prompt
+Exit with status 1 if there is a debconf prompt not in whitelist
+"""
+import re, os, sys
+
+# Keep this path in sync with the corresponding setting in
+# profile/defaults.cfg.d/defaults.cfg
+DEBCONF_LOG_PATH = '/var/log/dist-upgrade/debconf.log'
+RESULT_DIR = '/tmp'
+
+# Prompts in this list won't generate a test failure
+# i.e WHITELIST = ['libraries/restart-without-asking']
+WHITELIST = []
+
+def run_test(logfile, resultdir):
+    """ Run the test and slice debconf log
+
+    :param logfile: Path to debconf log
+    :param resultdir: Output directory to write log file to
+    """
+    global WHITELIST
+
+    ret = 0
+    if not os.path.exists(logfile):
+        return ret
+
+    re_dsetting = re.compile('^\w')
+    inprompt = False
+    prompt = dsetting = ""
+
+    with open(logfile, 'r') as f_in:
+        for line in f_in.readlines():
+            # Only keep interesting bits of the prompt
+            if line.startswith('#####'):
+                inprompt = not inprompt
+
+                # Reached the second separator, write content to result file
+                # One per  prompt
+                if not inprompt:
+                    print "Got debconf prompt for '%s'" % dsetting
+                    if dsetting in WHITELIST:
+                        print '    But it is in Whitelist. Skipping!'
+                        continue
+                    else:
+                        ret = 1
+
+                    with open(os.path.join(
+                        resultdir,
+                        'debconf_%s.log' % dsetting.replace('/', '_')),
+                        'w') as f_out:
+                        f_out.write(prompt)
+
+            if inprompt:
+                prompt += line
+                if re_dsetting.match(line) and '=' in line:
+                    dsetting = line.split('=')[0]
+
+    return ret
+
+if __name__ == '__main__':
+    sys.exit(run_test(DEBCONF_LOG_PATH, RESULT_DIR))

=== modified file 'AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg'
--- AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg	2011-12-30 22:06:53 +0000
+++ AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg	2012-01-18 14:54:29 +0000
@@ -29,6 +29,7 @@
 DebugBrokenScripts=yes
 UseUpgraderFromBzr=false
 ;AddRepo=local_testing.list
+DebconfLog=/var/log/dist-upgrade/debconf.log
 
 
 [KVM]

=== modified file 'DistUpgrade/DistUpgradeViewNonInteractive.py'
--- DistUpgrade/DistUpgradeViewNonInteractive.py	2011-07-15 15:50:31 +0000
+++ DistUpgrade/DistUpgradeViewNonInteractive.py	2012-01-18 14:54:29 +0000
@@ -59,7 +59,8 @@
     def __init__(self, logdir):
         InstallProgress.__init__(self)
         logging.debug("setting up environ for non-interactive use")
-        os.environ["DEBIAN_FRONTEND"] = "noninteractive"
+        if not os.environ.has_key("DEBIAN_FRONTEND"):
+            os.environ["DEBIAN_FRONTEND"] = "noninteractive"
         os.environ["APT_LISTCHANGES_FRONTEND"] = "none"
         os.environ["RELEASE_UPRADER_NO_APPORT"] = "1"
         self.config = DistUpgradeConfig(".")