Merge lp:~joetalbott/britney/fetch_exception_handling into lp:~canonical-ci-engineering/britney/boottesting-support

[Joe Talbott]

boottest - Add exception handling for manifest fetching.

boottest - Add exception handling for manifest fetching.

[lp:~joetalbott/britney/fetch_exception_handling]

457. By Joe Talbott on 2015-02-05

boottest - Add exception handling for manifest fetching

[Vincent Ladeuil (vila)]

Small tweaks in the inline comments, thanks for the speedy MP !

review: Approve

[lp:~joetalbott/britney/fetch_exception_handling]

458. By Joe Talbott on 2015-02-05

boottest - Add exception message to warning print and fix typo

[Celso Providelo (cprov)]

review: Needs Fixing

[lp:~joetalbott/britney/fetch_exception_handling]

459. By Joe Talbott on 2015-02-05

Don't bother creating another mocked urllib.urlopen.

[Celso Providelo (cprov)]

review: Approve

=== modified file 'boottest.py'
--- boottest.py	2015-02-05 13:15:07 +0000
+++ boottest.py	2015-02-05 22:22:26 +0000
@@ -79,7 +79,13 @@
                 "I: [%s] - Fetching manifest from %s" % (
                     time.asctime(), url))
             print("I: [%s] - saving it to %s" % (time.asctime(), self.path))
-        response = urllib.urlopen(url)
+        try:
+            response = urllib.urlopen(url)
+        except IOError as e:
+            print("W: [%s] - error connecting to %s: %s" % (
+                    time.asctime(), self.path, e))
+            return success  # failure
+
         # Only [re]create the manifest file if one was successfully downloaded
         # this allows for an existing image to be used if the download fails.
         if response.code == 200:

=== modified file 'tests/test_boottest.py'
--- tests/test_boottest.py	2015-02-05 14:43:23 +0000
+++ tests/test_boottest.py	2015-02-05 22:22:26 +0000
@@ -89,6 +89,11 @@
         self.assertEqual(1, len(manifest._manifest))
         self.assertIn('foo', manifest)
 
+    def test_fetch_exception(self):
+        self.mocked_urlopen.side_effect = [IOError("connection refused")]
+        manifest = boottest.TouchManifest('not-real', 'not-real')
+        self.assertEqual(0, len(manifest._manifest))
+
     def test_simple(self):
         # Existing manifest file allows callsites to properly check presence.
         manifest_dir = os.path.join(self.imagesdir, 'ubuntu/vivid')