x/cloudbase-init
Code Issues Proposed changes

Merge "Replaces InitiateSystemShutdownW"

Browse Source
This commit is contained in:
Jenkins 2015-09-11 00:17:54 +00:00 committed by Gerrit Code Review
commit 83743c7f5c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudbaseinit/osutils/windows.py
View File

@ -311,9 +311,9 @@ class WindowsUtils(base.BaseOSUtils):
def reboot(self): def reboot(self):
with privilege.acquire_privilege(win32security.SE_SHUTDOWN_NAME): with privilege.acquire_privilege(win32security.SE_SHUTDOWN_NAME):
ret_val = advapi32.InitiateSystemShutdownW( ret_val = advapi32.InitiateSystemShutdownExW(
0, "Cloudbase-Init reboot", 0, "Cloudbase-Init reboot",
0, True, True) 0, True, True, 0)
if not ret_val: if not ret_val:
raise exception.WindowsCloudbaseInitException( raise exception.WindowsCloudbaseInitException(
"Reboot failed: %r") "Reboot failed: %r")

6
cloudbaseinit/tests/osutils/test_windows.py
View File

@ -101,7 +101,7 @@ class TestWindowsUtils(testutils.CloudbaseInitTestBase):
expected_ret_value=None): expected_ret_value=None):
mock_privilege_module.acquire_privilege = mock.MagicMock() mock_privilege_module.acquire_privilege = mock.MagicMock()
advapi32 = self._windll_mock.advapi32 advapi32 = self._windll_mock.advapi32
advapi32.InitiateSystemShutdownW = mock.MagicMock( advapi32.InitiateSystemShutdownExW = mock.MagicMock(
return_value=ret_value) return_value=ret_value)
if not ret_value: if not ret_value:
@ -111,10 +111,10 @@ class TestWindowsUtils(testutils.CloudbaseInitTestBase):
else: else:
self._winutils.reboot() self._winutils.reboot()
advapi32.InitiateSystemShutdownW.assert_called_with( advapi32.InitiateSystemShutdownExW.assert_called_with(
0, 0,
"Cloudbase-Init reboot", "Cloudbase-Init reboot",
0, True, True) 0, True, True, 0)
mock_privilege_module.acquire_privilege.assert_called_once_with( mock_privilege_module.acquire_privilege.assert_called_once_with(
self._win32security_mock.SE_SHUTDOWN_NAME) self._win32security_mock.SE_SHUTDOWN_NAME)