Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-11-04 10:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

boottest - Add exception handling for manifest fetching

Browse Source
This commit is contained in:
Joe Talbott 2015-02-05 11:08:53 -05:00
parent a729746fa8
commit 87ccbfd731
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boottest.py
View File

@ -79,7 +79,13 @@ class TouchManifest(object):
"I: [%s] - Fetching manifest from %s" % ( "I: [%s] - Fetching manifest from %s" % (
time.asctime(), url)) time.asctime(), url))
print("I: [%s] - saving it to %s" % (time.asctime(), self.path)) 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" % (
time.asctime(), self.path))
return success # failure
# Only [re]create the manifest file if one was successfully downloaded # Only [re]create the manifest file if one was successfully downloaded
# this allows for an existing image to be used if the download fails. # this allows for an existing image to be used if the download fails.
if response.code == 200: if response.code == 200:

8
tests/test_boottest.py
View File

@ -89,6 +89,14 @@ class TestTouchManifest(unittest.TestCase):
self.assertEqual(1, len(manifest._manifest)) self.assertEqual(1, len(manifest._manifest))
self.assertIn('foo', manifest) self.assertIn('foo', manifest)
def test_fetch_excpetion(self):
_p = mock.patch('urllib.urlopen')
mocked_urlopen = _p.start()
self.addCleanup(_p.stop)
mocked_urlopen.side_effect = [IOError("connection refused")]
manifest = boottest.TouchManifest('not-real', 'not-real')
self.assertEqual(0, len(manifest._manifest))
def test_simple(self): def test_simple(self):
# Existing manifest file allows callsites to properly check presence. # Existing manifest file allows callsites to properly check presence.
manifest_dir = os.path.join(self.imagesdir, 'ubuntu/vivid') manifest_dir = os.path.join(self.imagesdir, 'ubuntu/vivid')