ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Hans Leidekker 2010-11-26 14:04:28 +01:00 committed by Alexandre Julliard
parent 4b5db7a9ac
commit e609bb0453
1 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dlls/msi/tests/package.c
View File

@ -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);