mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-23 13:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

appleupdates.py output tweaks; updated tests

Browse Source
This commit is contained in:
Greg Neagle
2011-12-22 14:32:13 -08:00
parent 5651b2a9a4
commit 96a2536141
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/appleupdates.py
+2
View File
@@ -493,6 +493,8 @@ class AppleUpdates(object):
os.makedirs(self.temp_cache_dir)
except OSError, oserr:
raise ReplicationError(oserr)
msg = 'Checking Apple Software Update catalog...'
self._ResetMunkiStatusAndDisplayMessage(msg)
munkicommon.display_detail('Caching CatalogURL %s', catalog_url)
try:
file_changed = self.GetSoftwareUpdateResource(
tests/code/client/munkilib/appleupdates_test.py
+8 -2
View File
@@ -871,7 +871,10 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.os.path.exists(self.au.temp_cache_dir).AndReturn(False)
appleupdates.os.makedirs(self.au.temp_cache_dir).AndReturn(None)
appleupdates.munkicommon.display_detail('Caching CatalogURL %s', url)
appleupdates.munkicommon.display_status_major(
'Checking Apple Software Update catalog...')
appleupdates.munkicommon.display_detail(
'Caching CatalogURL %s', url)
self.au.GetSoftwareUpdateResource(
url, self.au.apple_download_catalog_path, resume=True).AndReturn(
0)
@@ -925,7 +928,10 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.os.path.exists(self.au.temp_cache_dir).AndReturn(False)
appleupdates.os.makedirs(self.au.temp_cache_dir).AndReturn(None)
appleupdates.munkicommon.display_detail('Caching CatalogURL %s', url)
appleupdates.munkicommon.display_status_major(
'Checking Apple Software Update catalog...')
appleupdates.munkicommon.display_detail(
'Caching CatalogURL %s', url)
self.au.GetSoftwareUpdateResource(
url, self.au.apple_download_catalog_path, resume=True).AndRaise(
appleupdates.fetch.MunkiDownloadError)