Merge lp:~cjwatson/auto-upgrade-testing/obsolete-conffiles into lp:~auto-upgrade-testing-dev/auto-upgrade-testing/trunk

[Colin Watson]

18:02 <slangasek> cjwatson: which reminds me; half the "obsolete conffiles" still listed on the jenkins reports are actually ones that have been taken over by replacing packages, so should fall out of 'obsolete' the next time the packages are upgraded, I think - is there really anything more we should be doing here? ...
18:02 <slangasek> ... https://jenkins.qa.ubuntu.com/view/Precise%20Upgrade%20Testing%20Dashboard/job/precise-upgrade-lucid-server/ARCH=i386,LTS=lts,PROFILE=server,label=upgrade-test/68/artifact/lts-server/obsolete_conffiles.log
18:03 <slangasek> (console-setup, file, fuse, grub are all in this category)
18:03 <cjwatson> slangasek: sounds like we should fix the autotester to notice that then?
18:03 <cjwatson> I haven't been looking at obsolete conffiles at all, though
18:03 <pitti> cjwatson: it does?
18:04 <slangasek> cjwatson: prolly - just wanted confirmation you didn't think there was anything further we should do packaging side
18:04 <pitti> they become yellow (i. e. tests failed, but upgrade succeeded)
18:04 <cjwatson> pitti: I mean it should not even list cases where some other package has taken them over
18:04 <pitti> ah
18:05 <slangasek> pitti: well, things we don't care about at all should IMHO be green, not yellow :)
18:05 <slangasek> (for whatever value of "don't care about" applies)
18:05 <cjwatson> slangasek: I don't *think* so; in my head that's something Replaces should deal with
18:06 <cjwatson> keyboard-configuration doesn't seem to do anything special to take over console-setup.conf
18:06 <slangasek> yes
18:06 <infinity> I thought Replaces did deal with it...
18:06 <slangasek> and none of these conffiles are listed as "obsolete" on my system
18:06 <slangasek> so I *think* it gets flushed when you do a subsequent upgrade of the replaced package
18:06 <cjwatson> sounds plausible, yes
18:15 <slangasek> cjwatson: confirmed; apt-get install console-setup --> obsolete, apt-get install --reinstall console-setup --> disappeared

This branch removes these cases from the test output.

[Jean-Baptiste Lallement (jibel)]

Thanks for the fix!

review: Approve

=== modified file 'AutoUpgradeTester/post_upgrade_tests/test_conffiles.py'
--- AutoUpgradeTester/post_upgrade_tests/test_conffiles.py	2012-03-15 16:30:50 +0000
+++ AutoUpgradeTester/post_upgrade_tests/test_conffiles.py	2012-03-27 17:29:26 +0000
@@ -23,22 +23,29 @@
         test_output = ''
 
         dpkgquery = subprocess.check_output(cmd)
+        current = set()
+        obsolete = {}
         for pkg in dpkgquery.split('\n\n'):
-            obsolete = []
             pkg = pkg.strip().split('\n')
             pkgname = pkg[0]
             cfgfiles = pkg[1:]
             for cfgfile in cfgfiles:
-                try:
-                    (file, md5, status) = cfgfile.strip().split()
+                cfgbits = cfgfile.strip().split()
+                if len(cfgbits) < 3:
+                    # No status, not obsolete
+                    current.add(cfgbits[0])
+                else:
+                    file, md5, status = cfgbits[:3]
                     if 'obsolete' in status:
-                        obsolete.append(file)
-                except ValueError:
-                    # No status, not obsolete
-                    pass
+                        obsolete.setdefault(pkgname, []).append(file)
+                    else:
+                        current.add(file)
 
-            if obsolete:
-                test_output += "%s\n  %s\n" % (pkgname, "\n  ".join(obsolete))
+        for pkgname in sorted(obsolete.keys()):
+            cfgfiles = [cfgfile for cfgfile in obsolete[pkgname]
+                        if cfgfile not in current]
+            if cfgfiles:
+                test_output += "%s\n  %s\n" % (pkgname, "\n  ".join(cfgfiles))
 
         if test_output:
             with open(output_file, 'w') as f: