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

Make appleupdates_test.py stop complaining

Browse Source
This commit is contained in:
Greg Neagle
2015-07-29 08:57:12 -07:00
parent 9e0deb7540
commit 0ce7846fe5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/client/munkilib/appleupdates.py
View File

@@ -623,7 +623,7 @@ class AppleUpdates(object):
if munkicommon.stopRequested():
return []
if retcode: # there was an error
if munkicommon.getOsVersion() == '10.5':
if os_version_tuple == (10, 5):
pass # Leopard softwareupdate always returns a non-zero exit.
else:
munkicommon.display_error('softwareupdate error: %s' % retcode)

9
tests/code/client/munkilib/appleupdates_test.py
View File

@@ -569,7 +569,7 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.os.path.exists(
self.au.local_download_catalog_path).AndReturn(True)
appleupdates.munkicommon.getOsVersion().AndReturn('10.7')
appleupdates.munkicommon.getOsVersion(as_tuple=True).AndReturn((10, 7))
self.au._RunSoftwareUpdate(
['-d', '-a'],
catalog_url=catalog_url,
@@ -595,7 +595,7 @@ class TestAppleUpdates(mox.MoxTestBase):
self.au._ResetMunkiStatusAndDisplayMessage(msg).AndReturn(None)
appleupdates.os.path.exists(
self.au.local_download_catalog_path).AndReturn(True)
appleupdates.munkicommon.getOsVersion().AndReturn('10.5')
appleupdates.munkicommon.getOsVersion(as_tuple=True).AndReturn((10,5))
self.au._LeopardDownloadAvailableUpdates(catalog_url).AndReturn(2)
appleupdates.munkicommon.display_error('softwareupdate error: %s' % 2)
@@ -636,6 +636,7 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.os.unlink(self.au.applicable_updates_plist).AndRaise(
OSError)
appleupdates.munkicommon.getOsVersion(as_tuple=True).AndReturn((10, 6))
catalog_url = 'file://localhost' + appleupdates.urllib2.quote(
self.au.extracted_catalog_path)
self.au._RunSoftwareUpdate(
@@ -643,7 +644,6 @@ class TestAppleUpdates(mox.MoxTestBase):
catalog_url=catalog_url,
stop_allowed=True).AndReturn(1)
appleupdates.munkicommon.getOsVersion().AndReturn('10.6')
appleupdates.munkicommon.display_error('softwareupdate error: %s' % 1)
appleupdates.munkicommon.stopRequested().AndReturn(False)
@@ -665,6 +665,7 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.os.unlink(self.au.applicable_updates_plist).AndRaise(
OSError)
appleupdates.munkicommon.getOsVersion(as_tuple=True).AndReturn((10, 6))
catalog_url = 'file://localhost' + appleupdates.urllib2.quote(
self.au.extracted_catalog_path)
self.au._RunSoftwareUpdate(
@@ -694,6 +695,7 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.os.unlink(self.au.applicable_updates_plist).AndRaise(
OSError)
appleupdates.munkicommon.getOsVersion(as_tuple=True).AndReturn((10, 6))
catalog_url = 'file://localhost' + appleupdates.urllib2.quote(
self.au.extracted_catalog_path)
self.au._RunSoftwareUpdate(
@@ -730,6 +732,7 @@ class TestAppleUpdates(mox.MoxTestBase):
appleupdates.os.unlink(self.au.applicable_updates_plist).AndRaise(
OSError)
appleupdates.munkicommon.getOsVersion(as_tuple=True).AndReturn((10, 6))
catalog_url = 'file://localhost' + appleupdates.urllib2.quote(
self.au.extracted_catalog_path)
self.au._RunSoftwareUpdate(