mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-22 20:48:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated appleupdates.py with workarounds for changes in upcoming OS X releases. Bumped version to 0.9.2, since this is a non-trivial change.

Browse Source
This commit is contained in:
Greg Neagle
2013-10-07 14:31:31 -07:00
parent 543f2bf16f
commit ec942c5992
3 changed files with 147 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/code/client/munkilib/appleupdates_test.py
+12 -11
View File
@@ -562,7 +562,8 @@ class TestAppleUpdates(mox.MoxTestBase):
self.au.local_download_catalog_path).AndReturn(True)
appleupdates.munkicommon.getOsVersion().AndReturn('10.7')
self.au._RunSoftwareUpdate(
['--CatalogURL', catalog_url, '-d', '-a'],
['-d', '-a'],
catalog_url=catalog_url,
stop_allowed=True).AndReturn(0)
appleupdates.munkicommon.stopRequested().AndReturn(False)
@@ -629,8 +630,8 @@ class TestAppleUpdates(mox.MoxTestBase):
catalog_url = 'file://localhost' + appleupdates.urllib2.quote(
self.au.extracted_catalog_path)
self.au._RunSoftwareUpdate(
['--CatalogURL', catalog_url, '-l', '-f',
self.au.applicable_updates_plist],
['-l', '-f', self.au.applicable_updates_plist],
catalog_url=catalog_url,
stop_allowed=True).AndReturn(1)
appleupdates.munkicommon.getOsVersion().AndReturn('10.6')
@@ -658,8 +659,8 @@ class TestAppleUpdates(mox.MoxTestBase):
catalog_url = 'file://localhost' + appleupdates.urllib2.quote(
self.au.extracted_catalog_path)
self.au._RunSoftwareUpdate(
['--CatalogURL', catalog_url, '-l', '-f',
self.au.applicable_updates_plist],
['-l', '-f', self.au.applicable_updates_plist],
catalog_url=catalog_url,
stop_allowed=True).AndReturn(0)
exc = appleupdates.FoundationPlist.NSPropertyListSerializationException
@@ -687,8 +688,8 @@ class TestAppleUpdates(mox.MoxTestBase):
catalog_url = 'file://localhost' + appleupdates.urllib2.quote(
self.au.extracted_catalog_path)
self.au._RunSoftwareUpdate(
['--CatalogURL', catalog_url, '-l', '-f',
self.au.applicable_updates_plist],
['-l', '-f', self.au.applicable_updates_plist],
catalog_url=catalog_url,
stop_allowed=True).AndReturn(0)
appleupdates.FoundationPlist.readPlist(
@@ -723,9 +724,9 @@ class TestAppleUpdates(mox.MoxTestBase):
catalog_url = 'file://localhost' + appleupdates.urllib2.quote(
self.au.extracted_catalog_path)
self.au._RunSoftwareUpdate(
['--CatalogURL', catalog_url, '-l', '-f',
self.au.applicable_updates_plist],
stop_allowed=True).AndReturn(0)
['-l', '-f', self.au.applicable_updates_plist],
catalog_url=catalog_url,
stop_allowed=True).AndReturn(0)
appleupdates.FoundationPlist.readPlist(
self.au.applicable_updates_plist).AndReturn(updates_plist_dict)
@@ -1511,7 +1512,7 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.kCFPreferencesCurrentHost).AndReturn(None)
appleupdates.CFPreferencesAppSynchronize(
appleupdates.APPLE_SOFTWARE_UPDATE_PREFS_DOMAIN).AndReturn(None)
appleupdates.munkicommon.display_warning(
appleupdates.munkicommon.display_error(
'Error setting com.apple.SoftwareUpdate ByHost preferences.')
self.mox.ReplayAll()