[master] migrating mac module integration tests to pytest.

salt/modules/mac_keychain.py

@@ -122,14 +122,14 @@ def list_certs(keychain="/Library/Keychains/System.keychain"):
         salt '*' keychain.list_certs
     """
     cmd = (
-        'security find-certificate -a {} | grep -o "alis".*\\" | '
+        'security find-certificate -a {} | grep -o "alis.*" | '
         "grep -o '\\\"[-A-Za-z0-9.:() ]*\\\"'".format(shlex.quote(keychain))
     )
     out = __salt__["cmd.run"](cmd, python_shell=True)
     return out.replace('"', "").split("\n")
 
 
-def get_friendly_name(cert, password):
+def get_friendly_name(cert, password, legacy=False):
     """
     Get the friendly name of the given certificate
 
@@ -143,15 +143,26 @@ def get_friendly_name(cert, password):
         Note: The password given here will show up as plaintext in the returned job
         info.
 
+    legacy
+        Assume legacy format for certificate.
+
     CLI Example:
 
     .. code-block:: bash
 
         salt '*' keychain.get_friendly_name /tmp/test.p12 test123
+
+        salt '*' keychain.get_friendly_name /tmp/test.p12 test123 legacy=True
     """
+    openssl_cmd = "openssl pkcs12"
+    if legacy:
+        openssl_cmd = f"{openssl_cmd} -legacy"
+
     cmd = (
-        "openssl pkcs12 -in {} -passin pass:{} -info -nodes -nokeys 2> /dev/null | "
-        "grep friendlyName:".format(shlex.quote(cert), shlex.quote(password))
+        "{} -in {} -passin pass:{} -info -nodes -nokeys 2> /dev/null | "
+        "grep friendlyName:".format(
+            openssl_cmd, shlex.quote(cert), shlex.quote(password)
+        )
     )
     out = __salt__["cmd.run"](cmd, python_shell=True)
     return out.replace("friendlyName: ", "").strip()

salt/modules/mac_power.py

@@ -68,7 +68,7 @@ def _validate_sleep(minutes):
             )
             raise SaltInvocationError(msg)
     else:
-        msg = "Unknown Variable Type Passed for Minutes.\nPassed: {}".format(minutes)
+        msg = f"Unknown Variable Type Passed for Minutes.\nPassed: {minutes}"
         raise SaltInvocationError(msg)
 
 
@@ -115,7 +115,7 @@ def set_sleep(minutes):
         salt '*' power.set_sleep never
     """
     value = _validate_sleep(minutes)
-    cmd = "systemsetup -setsleep {}".format(value)
+    cmd = f"systemsetup -setsleep {value}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     state = []
@@ -165,7 +165,7 @@ def set_computer_sleep(minutes):
         salt '*' power.set_computer_sleep off
     """
     value = _validate_sleep(minutes)
-    cmd = "systemsetup -setcomputersleep {}".format(value)
+    cmd = f"systemsetup -setcomputersleep {value}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     return salt.utils.mac_utils.confirm_updated(
@@ -210,7 +210,7 @@ def set_display_sleep(minutes):
         salt '*' power.set_display_sleep off
     """
     value = _validate_sleep(minutes)
-    cmd = "systemsetup -setdisplaysleep {}".format(value)
+    cmd = f"systemsetup -setdisplaysleep {value}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     return salt.utils.mac_utils.confirm_updated(
@@ -255,7 +255,7 @@ def set_harddisk_sleep(minutes):
         salt '*' power.set_harddisk_sleep off
     """
     value = _validate_sleep(minutes)
-    cmd = "systemsetup -setharddisksleep {}".format(value)
+    cmd = f"systemsetup -setharddisksleep {value}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     return salt.utils.mac_utils.confirm_updated(
@@ -303,12 +303,13 @@ def set_wake_on_modem(enabled):
         salt '*' power.set_wake_on_modem True
     """
     state = salt.utils.mac_utils.validate_enabled(enabled)
-    cmd = "systemsetup -setwakeonmodem {}".format(state)
+    cmd = f"systemsetup -setwakeonmodem {state}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     return salt.utils.mac_utils.confirm_updated(
         state,
         get_wake_on_modem,
+        True,
     )
 
 
@@ -353,12 +354,13 @@ def set_wake_on_network(enabled):
         salt '*' power.set_wake_on_network True
     """
     state = salt.utils.mac_utils.validate_enabled(enabled)
-    cmd = "systemsetup -setwakeonnetworkaccess {}".format(state)
+    cmd = f"systemsetup -setwakeonnetworkaccess {state}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     return salt.utils.mac_utils.confirm_updated(
         state,
         get_wake_on_network,
+        True,
     )
 
 
@@ -403,12 +405,13 @@ def set_restart_power_failure(enabled):
         salt '*' power.set_restart_power_failure True
     """
     state = salt.utils.mac_utils.validate_enabled(enabled)
-    cmd = "systemsetup -setrestartpowerfailure {}".format(state)
+    cmd = f"systemsetup -setrestartpowerfailure {state}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     return salt.utils.mac_utils.confirm_updated(
         state,
         get_restart_power_failure,
+        True,
     )
 
 
@@ -453,7 +456,7 @@ def set_restart_freeze(enabled):
         salt '*' power.set_restart_freeze True
     """
     state = salt.utils.mac_utils.validate_enabled(enabled)
-    cmd = "systemsetup -setrestartfreeze {}".format(state)
+    cmd = f"systemsetup -setrestartfreeze {state}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     return salt.utils.mac_utils.confirm_updated(state, get_restart_freeze, True)
@@ -502,10 +505,11 @@ def set_sleep_on_power_button(enabled):
         salt '*' power.set_sleep_on_power_button True
     """
     state = salt.utils.mac_utils.validate_enabled(enabled)
-    cmd = "systemsetup -setallowpowerbuttontosleepcomputer {}".format(state)
+    cmd = f"systemsetup -setallowpowerbuttontosleepcomputer {state}"
     salt.utils.mac_utils.execute_return_success(cmd)
 
     return salt.utils.mac_utils.confirm_updated(
         state,
         get_sleep_on_power_button,
+        True,
     )