From 9ba8989026231b034bc4f91061671bf87263e9f6 Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Wed, 23 Apr 2008 18:45:49 -0500 Subject: [PATCH] shell32: Fix a test that fails in win2k3. --- dlls/shell32/tests/shlfileop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index e940c86826b..df4bd411d1e 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -963,7 +963,9 @@ static void test_copy(void) shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + ok(retval == ERROR_CANCELLED || + retval == ERROR_SUCCESS, /* win2k3 */ + "Expected ERROR_CANCELLED or ERROR_SUCCESS, got %d\n", retval); ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n"); ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); ok(DeleteFileA("one.txt"), "Expected file to exist\n");