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

[Brian Murray]

Brian Murray has proposed merging lp:~brian-murray/ubuntu-release-upgrader/test-ordering into lp:ubuntu-release-upgrader.

Requested reviews:
  Ubuntu Core Development Team (ubuntu-core-dev)

For more details, see:
https://code.launchpad.net/~brian-murray/ubuntu-release-upgrader/test-ordering/+merge/294313

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.
-- 
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~brian-murray/ubuntu-release-upgrader/test-ordering into lp:ubuntu-release-upgrader.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1877 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20160510/3fbd6ad1/attachment.diff>