Alexandre Julliard : msi/tests: Fix test that depends on the order of the files in a directory.

Alexandre Julliard julliard at winehq.org
Mon Feb 11 14:19:31 CST 2008


Module: wine
Branch: master
Commit: 2e6ec395650f1af30c6db45206f148d05d834361
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2e6ec395650f1af30c6db45206f148d05d834361

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Feb 11 20:17:27 2008 +0100

msi/tests: Fix test that depends on the order of the files in a directory.

---

 dlls/msi/tests/install.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index b5892c0..88c8cb5 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3530,9 +3530,12 @@ static void test_movefiles(void)
     ok(delete_pf("msitest\\kiribati", TRUE), "File not moved\n");
     ok(!delete_pf("msitest\\lebanon", TRUE), "File moved\n");
     ok(!delete_pf("msitest\\lebanon", FALSE), "Directory moved\n");
-    ok(!delete_pf("msitest\\apple", TRUE), "File should not exist\n");
+    /* either apple or application will be moved depending on directory order */
+    if (!delete_pf("msitest\\apple", TRUE))
+        ok(delete_pf("msitest\\application", TRUE), "File not moved\n");
+    else
+        ok(!delete_pf("msitest\\application", TRUE), "File should not exist\n");
     ok(delete_pf("msitest\\wildcard", TRUE), "File not moved\n");
-    ok(delete_pf("msitest\\application", TRUE), "File not moved\n");
     ok(!delete_pf("msitest\\ape", TRUE), "File moved\n");
     ok(delete_pf("msitest\\foo", TRUE), "File not moved\n");
     ok(!delete_pf("msitest\\fao", TRUE), "File should not exist\n");




More information about the wine-cvs mailing list