Switch to run command

azurelinuxagent/common/osutil/ubuntu.py

@@ -130,7 +130,7 @@ def restart_if(self, ifname, retries=3, wait=5):
             try:
                 shellutil.run_command(["ip", "link", "set", ifname, "down"])
                 shellutil.run_command(["ip", "link", "set", ifname, "up"])
-                return
+
             except shellutil.CommandError as cmd_err:
                 logger.warn("failed to restart {0}: return code {1}".format(ifname, cmd_err.returncode))
                 if attempt < retry_limit:

azurelinuxagent/common/utils/cryptutil.py

@@ -96,6 +96,9 @@ def decrypt_p7m(self, p7m_file, trans_prv_file, trans_cert_file, pem_file):
             stdout, stderr = second_proc.communicate()
 
             if first_proc.returncode != 0 or second_proc.returncode != 0:
+                stdout = ustr(stdout, encoding='utf-8', errors="backslashreplace") if stdout else ""
+                stderr =  ustr(stderr, encoding='utf-8', errors="backslashreplace") if stderr else ""
+
                 msg = """Failed to decrypt {0}
                 [stdout]
                 {1}

tests/common/osutil/test_default.py

@@ -70,7 +70,7 @@ def test_restart(self):
                 self.assertEqual(cmd_queue.pop(0), ["ifdown", ifname])
                 # We don't expect the following command to be called because 'dummy' does
                 # not exist.
-                # self.assertEqual(cmd_queue.pop(0), ["ifup", ifname])
+                self.assertNotEqual(cmd_queue[0] if cmd_queue else None, ["ifup", ifname])
 
 
     def test_get_dvd_device_success(self):