Refactor update

salt/modules/mac_softwareupdate.py

@@ -324,14 +324,9 @@ def update(name):
 
     .. code-block:: bash
 
-       salt '*' softwareupdate.install <update-name>
+       salt '*' softwareupdate.update <update-name>
     '''
-    try:
+    if not update_available(name):
-        updates = _get_available()
-    except CommandExecutionError as exc:
-        raise CommandExecutionError(exc)
-
-    if name not in updates:
         raise SaltInvocationError('Update not available: {0}'.format(name))
 
     try:
@@ -340,12 +335,7 @@ def update(name):
     except CommandExecutionError as exc:
         raise CommandExecutionError(exc)
 
-    try:
+    return not update_available(name)
-        updates = _get_available()
-    except CommandExecutionError as exc:
-        raise CommandExecutionError(exc)
-
-    return name not in updates
 
 
 def update_available(name):

tests/integration/modules/mac_softwareupdate.py

@@ -113,15 +113,22 @@ class MacSoftwareUpdateModuleTest(integration.ModuleCase):
         self.assertFalse(self.run_function('softwareupdate.schedule_enabled'))
 
     @destructiveTest
-    def test_update_all(self):
+    def test_update(self):
         '''
         Test softwareupdate.update_all
+        Test softwareupdate.update
+        Test softwareupdate.update_available
         '''
         # There's no way to know what the dictionary will contain, so all we can
         # check is that the return is a dictionary
         self.assertIsInstance(
             self.run_function('softwareupdate.update_all'), dict)
 
+        # Test update not available
+        self.assertIn(
+            'Update not available',
+            self.run_function('softwareupdate.update', ['spongebob']))
+
     @destructiveTest
     def test_install(self):
         '''