Merge lp:~brian-murray/apt-clone/test_clone_upgrade_ports into lp:apt-clone

[Brian Murray]

apt-clone tests are failing on armhf and ppc64el. My branch will fix the issue with armhf and eventually (when we move to U) with ppc64el, the problem is that the test tries to upgrade from saucy to trusty and there is no ppc64el for saucy. I'm not sure how to fix ppc64el right now.

[Brian Murray (brian-murray)]

Oh here are the build failures:

https://jenkins.qa.ubuntu.com/view/Trusty/view/AutoPkgTest/job/trusty-adt-apt-clone-armhf/
https://jenkins.qa.ubuntu.com/view/Trusty/view/AutoPkgTest/job/trusty-adt-apt-clone-ppc64el/

[Michael Vogt (mvo)]

Looks good, thanks! I look at the ppc64el case now.

review: Approve

=== modified file 'tests/test_clone_upgrade.py'
--- tests/test_clone_upgrade.py	2013-07-26 19:43:44 +0000
+++ tests/test_clone_upgrade.py	2014-02-21 23:25:33 +0000
@@ -10,6 +10,7 @@
 import io
 
 import apt
+import apt_pkg
 import distro_info
 
 sys.path.insert(0, "..")
@@ -62,10 +63,17 @@
         sources_list = os.path.join(tmpdir, "etc", "apt", "sources.list")
         if not os.path.exists(os.path.dirname(sources_list)):
             os.makedirs(os.path.dirname(sources_list))
+        # this still won't work for new architectures like ppc64el
+        # as they don't exist for from_dist
+        arch = apt_pkg.config.find("APT::Architecture")
+        if arch in ['i386', 'amd64']:
+            server = 'archive.ubuntu.com/ubuntu'
+        else:
+            server = 'ports.ubuntu.com/ubuntu-ports'
         with open(os.path.join(sources_list), "w") as fp:
             fp.write("""
-deb http://archive.ubuntu.com/ubuntu %s main restricted universe multiverse
-""" % from_dist)
+deb http://%s %s main restricted universe multiverse
+""" % (server, from_dist))
         cache = apt.Cache(rootdir=tmpdir)
         cache.update()
         cache.open()