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

Alexandre Julliard julliard at winehq.org
Wed Feb 27 08:03:21 CST 2008


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Wed Feb 27 09:16:20 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 704d531..1f64010 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3660,8 +3660,11 @@ static void test_movefiles(void)
         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\\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");
+    /* either fao or foo will be moved depending on directory order */
+    if (delete_pf("msitest\\foo", TRUE))
+        ok(!delete_pf("msitest\\fao", TRUE), "File should not exist\n");
+    else
+        ok(delete_pf("msitest\\fao", TRUE), "File not moved\n");
     ok(delete_pf("msitest\\single", TRUE), "File not moved\n");
     ok(!delete_pf("msitest\\fbod", TRUE), "File moved\n");
     ok(delete_pf("msitest\\budding", TRUE), "File not moved\n");




More information about the wine-cvs mailing list