Merge lp:~brian-murray/ubuntu-release-upgrader/test-ordering into lp:ubuntu-release-upgrader

[Brian Murray]

The test test_sources_list.py would fail if run by itself (with a NoDistroTemplate Exception) and would only succeed if it was run after test_dist_ugprade_fetcher_core.py. This is because test_dist_upgrade_fetcher_core.py downloads an ubuntu-release-upgrader tarball which includes Ubuntu.info and Ubuntu.mirrors from python-apt. Additionally, something in the dist upgrade fetcher test would also set the working directory to '/tmp/ubuntu-release-upgrader-XYZ' which contained the Ubuntu.* files.

Then test_sources_list.py uses DistUpgradeController which sets the following:

self.sources = SourcesList(matcherPath=".")

So when the test is run without test_dist_upgrade_fetcher_core.py we check the current directory for python apt templates and find none, so the test fails. I've resolved this by making the matcherPath dynamic and including Ubuntu.info and Ubuntu.mirrors in the tests' data directory.

[Barry Warsaw (barry)]

Nice! :)

review: Approve

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2016-04-06 04:52:31 +0000
+++ DistUpgrade/DistUpgradeController.py	2016-05-10 22:59:58 +0000
@@ -793,7 +793,7 @@
 
     def updateSourcesList(self):
         logging.debug("updateSourcesList()")
-        self.sources = SourcesList(matcherPath=".")
+        self.sources = SourcesList(matcherPath=self.datadir)
         # backup first!
         self.sources.backup(self.sources_backup_ext)
         if not self.rewriteSourcesList(mirror_check=True):
@@ -813,7 +813,7 @@
                                ) % (self.fromDist, self.toDist))
             if res:
                 # re-init the sources and try again
-                self.sources = SourcesList(matcherPath=".")
+                self.sources = SourcesList(matcherPath=self.datadir)
                 # its ok if rewriteSourcesList fails here if
                 # we do not use a network, the sources.list may be empty
                 if (not self.rewriteSourcesList(mirror_check=False)

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-10 20:53:14 +0000
+++ debian/changelog	2016-05-10 22:59:58 +0000
@@ -1,6 +1,9 @@
 ubuntu-release-upgrader (1:16.10.2) UNRELEASED; urgency=medium
 
   * data/release-upgrades: switch prompt from LTS to normal (LP: #1577165)
+  * DistUpgrade/DistUpgradeController.py: instead of statically setting
+    matcherPath, for a SourcesList, to "." set it to datadir which may be "."
+    or something else entirely (like when we are running a test).
 
  -- Brian Murray <[e-mail]>  Tue, 10 May 2016 13:51:58 -0700
 

=== added symlink 'tests/data-sources-list-test/Ubuntu.info'
=== target is u'/usr/share/python-apt/templates/Ubuntu.info'
=== added symlink 'tests/data-sources-list-test/Ubuntu.mirrors'
=== target is u'/usr/share/python-apt/templates/Ubuntu.mirrors'