Hans Leidekker : msi/test: Mark some test results as broken.

[Alexandre Julliard]

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

Author: Hans Leidekker 
Date:   Fri Sep  9 10:59:36 2011 +0200

msi/test: Mark some test results as broken.

---

dlls/msi/tests/install.c |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 1ebdd5d..04c709f 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3154,12 +3154,14 @@ static void test_samesequence(void)
     MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);

r = MsiInstallProductA(msifile, NULL);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
-    ok(delete_pf("msitest\augustus", TRUE), "File not installed\n");
-    ok(delete_pf("msitest\caesar", TRUE), "File not installed\n");
-    ok(delete_pf("msitest\maximus", TRUE), "File not installed\n");
-    ok(delete_pf("msitest", FALSE), "Directory not created\n");
-
+    ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r);
+    if (r == ERROR_SUCCESS)
+    {
+        ok(delete_pf("msitest\augustus", TRUE), "File not installed\n");
+        ok(delete_pf("msitest\caesar", TRUE), "File not installed\n");
+        ok(delete_pf("msitest\maximus", TRUE), "File not installed\n");
+        ok(delete_pf("msitest", FALSE), "Directory not created\n");
+    }
     delete_cab_files();
     DeleteFile(msifile);
 }
@@ -3174,12 +3176,14 @@ static void test_uiLevelFlags(void)
     MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL);

r = MsiInstallProductA(msifile, NULL);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
-    ok(!delete_pf("msitest\maximus", TRUE), "UI install occurred, but execute-only was requested.\n");
-    ok(delete_pf("msitest\caesar", TRUE), "File not installed\n");
-    ok(delete_pf("msitest\augustus", TRUE), "File not installed\n");
-    ok(delete_pf("msitest", FALSE), "Directory not created\n");
-
+    ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r);
+    if (r == ERROR_SUCCESS)
+    {
+        ok(!delete_pf("msitest\maximus", TRUE), "UI install occurred, but execute-only was requested.\n");
+        ok(delete_pf("msitest\caesar", TRUE), "File not installed\n");
+        ok(delete_pf("msitest\augustus", TRUE), "File not installed\n");
+        ok(delete_pf("msitest", FALSE), "Directory not created\n");
+    }
     delete_cab_files();
     DeleteFile(msifile);
 }