Hans Leidekker : msi/tests: Fix the scope of todo_wine in the tests for MsiApplyMultiplePatches.
Alexandre Julliard
julliard at winehq.org
Fri Nov 26 10:20:08 CST 2010
Module: wine
Branch: master
Commit: e609bb04530fa404c1f7b31fc1aa36a71ac7ccd5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e609bb04530fa404c1f7b31fc1aa36a71ac7ccd5
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Nov 26 14:04:28 2010 +0100
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.
---
dlls/msi/tests/package.c | 52 ++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 7e236e4..1f1d8d2 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -12794,51 +12794,31 @@ static void test_MsiApplyMultiplePatches(void)
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r);
r = pMsiApplyMultiplePatchesA(";", NULL, NULL);
- todo_wine
- {
- if (type == DRIVE_FIXED)
- ok(r == ERROR_PATH_NOT_FOUND,
- "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
- else
- ok(r == ERROR_INVALID_NAME,
- "Expected ERROR_INVALID_NAME, got %u\n", r);
- }
+ if (type == DRIVE_FIXED)
+ todo_wine ok(r == ERROR_PATH_NOT_FOUND, "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);
- todo_wine
- {
- if (type == DRIVE_FIXED)
- ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED,
- "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r);
- else
- ok(r == ERROR_INVALID_NAME,
- "Expected ERROR_INVALID_NAME, got %u\n", r);
- }
+ if (type == DRIVE_FIXED)
+ todo_wine ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, "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);
- todo_wine
- {
- if (type == DRIVE_FIXED)
- ok(r == ERROR_PATH_NOT_FOUND,
- "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
- else
- ok(r == ERROR_INVALID_NAME,
- "Expected ERROR_INVALID_NAME, got %u\n", r);
- }
+ if (type == DRIVE_FIXED)
+ todo_wine ok(r == ERROR_PATH_NOT_FOUND, "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);
todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r);
r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL);
- todo_wine
- {
- if (type == DRIVE_FIXED)
- ok(r == ERROR_PATH_NOT_FOUND,
- "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
- else
- ok(r == ERROR_INVALID_NAME,
- "Expected ERROR_INVALID_NAME, got %u\n", r);
- }
+ if (type == DRIVE_FIXED)
+ todo_wine ok(r == ERROR_PATH_NOT_FOUND, "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);
todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r);
More information about the wine-cvs
mailing list