Skip to content
Snippets Groups Projects
Commit e609bb04 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files

msi/tests: Fix the scope of todo_wine in the tests for MsiApplyMultiplePatches.

These tests succeed on Wine if you run them from a volume for which GetDriveType
returns something other than DRIVE_FIXED, e.g. a ramdisk.
parent 4b5db7a9
No related branches found
No related tags found
No related merge requests found
...@@ -12794,51 +12794,31 @@ static void test_MsiApplyMultiplePatches(void) ...@@ -12794,51 +12794,31 @@ static void test_MsiApplyMultiplePatches(void)
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r);
   
r = pMsiApplyMultiplePatchesA(";", NULL, NULL); r = pMsiApplyMultiplePatchesA(";", NULL, NULL);
todo_wine if (type == DRIVE_FIXED)
{ todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
if (type == DRIVE_FIXED) else
ok(r == ERROR_PATH_NOT_FOUND, ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r);
"Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
else
ok(r == ERROR_INVALID_NAME,
"Expected ERROR_INVALID_NAME, got %u\n", r);
}
   
r = pMsiApplyMultiplePatchesA(" ;", NULL, NULL); r = pMsiApplyMultiplePatchesA(" ;", NULL, NULL);
todo_wine if (type == DRIVE_FIXED)
{ todo_wine ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r);
if (type == DRIVE_FIXED) else
ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r);
"Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r);
else
ok(r == ERROR_INVALID_NAME,
"Expected ERROR_INVALID_NAME, got %u\n", r);
}
   
r = pMsiApplyMultiplePatchesA(";;", NULL, NULL); r = pMsiApplyMultiplePatchesA(";;", NULL, NULL);
todo_wine if (type == DRIVE_FIXED)
{ todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
if (type == DRIVE_FIXED) else
ok(r == ERROR_PATH_NOT_FOUND, ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r);
"Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
else
ok(r == ERROR_INVALID_NAME,
"Expected ERROR_INVALID_NAME, got %u\n", r);
}
   
r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL);
todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r);
   
r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL);
todo_wine if (type == DRIVE_FIXED)
{ todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
if (type == DRIVE_FIXED) else
ok(r == ERROR_PATH_NOT_FOUND, ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r);
"Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
else
ok(r == ERROR_INVALID_NAME,
"Expected ERROR_INVALID_NAME, got %u\n", r);
}
   
r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL);
todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment