tests: Remove unused warning conditional in appleupdates.CheckForSoftwareUpdates

- fixes a failing test since merging NSURL branch
This commit is contained in:
Timothy Sutton
2014-10-25 14:32:45 -04:00
parent 69aa144886
commit 1069f05b8d

View File

@@ -1073,13 +1073,11 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.munkicommon.getsha256hash(
self.au.apple_download_catalog_path).AndReturn(None)
self.au.CacheAppleCatalog().AndRaise(exc(s))
if exc == appleupdates.ReplicationError:
if exc == appleupdates.ReplicationError or \
exc == appleupdates.fetch.MunkiDownloadError:
appleupdates.munkicommon.display_warning(
'Could not download Apple SUS catalog:')
appleupdates.munkicommon.display_warning('\t%s', s)
elif exc == appleupdates.fetch.MunkiDownloadError:
appleupdates.munkicommon.display_warning(
'Could not download Apple SUS catalog.')
self.mox.ReplayAll()
self.assertFalse(self.au.CheckForSoftwareUpdates())