Merge lp:~raharper/curtin/trunk.skip-apt-proxy-test-if-not-set into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

vmtest: skip apt-proxy test if not set

Testing of apt-proxy requires one to be set in the host. If a proxy
is not set then the test-case will fail. This was discovered on diglett
host which usally has an apt-proxy but recently it was disabled which
tripped this failure.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:442
https://jenkins.ubuntu.com/server/job/curtin-ci/295/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-amd64/295
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/295
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-ppc64el/295
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-s390x/295

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/295/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

surprised this lasted this long.
thanks!

review: Approve

=== modified file 'tests/vmtests/test_old_apt_features.py'
--- tests/vmtests/test_old_apt_features.py	2016-08-05 01:07:26 +0000
+++ tests/vmtests/test_old_apt_features.py	2017-01-26 15:25:19 +0000
@@ -41,8 +41,8 @@
     def test_output_files_exist(self):
         """test_output_files_exist - Check if all output files exist"""
         self.output_files_exist(
-            ["debc", "aptconf", "sources.list", "90curtin-aptproxy",
-             "curtin-preserve-sources.cfg", "90_dpkg.cfg"])
+            ["debc", "aptconf", "sources.list", "curtin-preserve-sources.cfg",
+             "90_dpkg.cfg"])
 
     def test_preserve_source(self):
         """test_preserve_source - no clobbering sources.list by cloud-init"""
@@ -56,7 +56,10 @@
     def test_aptconf(self):
         """test_aptconf - Check if apt conf for proxy is in place"""
         # this gets configured by tools/launch and get_apt_proxy in
-        # tests/vmtests/__init__.py, so compare with those
+        # tests/vmtests/__init__.py, so compare with those, if set
+        if not self.proxy:
+            self.skipTest('Host apt-proxy not set')
+        self.output_files_exist(["90curtin-aptproxy"])
         rproxy = r"Acquire::http::Proxy \"" + re.escape(self.proxy) + r"\";"
         self.check_file_regex("aptconf", rproxy)
         self.check_file_regex("90curtin-aptproxy", rproxy)