[PATCH 1/2] msi/tests: Fix test_feature_override() to properly clean up its features on removal.
This was leaving behind registry entries (as well as the already accounted-for program files), which apparently caused subsequent test failures when running msi:action.
While Wine is not behaving exactly correctly here (i.e. and removing the feature anyway), I suspect it is not sufficiently interesting to test whether we behave correctly with what is essentially a buggy package.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- For reference: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/Using-Conditio...
dlls/msi/tests/install.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 365f1d3a756..0bd82a621fc 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -966,8 +966,8 @@ static const CHAR fo_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescriptio static const CHAR fo_condition_dat[] = "Feature_\tLevel\tCondition\n" "s38\ti2\tS255\n" "Condition\tFeature_\tLevel\n" - "preselected\t0\tPreselected\n" - "notpreselected\t0\tNOT Preselected\n"; + "preselected\t0\tPreselected AND NOT REMOVE\n" + "notpreselected\t0\tNOT Preselected AND NOT REMOVE\n";
static const CHAR fo_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -5464,10 +5464,8 @@ static void test_feature_override(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(!delete_pf("msitest\override.txt", TRUE), "file not removed\n"); - todo_wine { - ok(delete_pf("msitest\preselected.txt", TRUE), "file removed\n"); - ok(delete_pf("msitest", FALSE), "directory removed\n"); - } + ok(!delete_pf("msitest\preselected.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n");
r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5480,10 +5478,8 @@ static void test_feature_override(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(!delete_pf("msitest\override.txt", TRUE), "file not removed\n"); - todo_wine { - ok(delete_pf("msitest\preselected.txt", TRUE), "file removed\n"); - ok(delete_pf("msitest", FALSE), "directory removed\n"); - } + ok(!delete_pf("msitest\preselected.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n");
delete_key(HKEY_LOCAL_MACHINE, "Software\Wine\msitest", access);
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/msi/tests/install.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0bd82a621fc..f7fd83cfc08 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2744,15 +2744,14 @@ static void test_MsiInstallProduct(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
- /* szPackagePath is NULL */ - r = MsiInstallProductA(NULL, "INSTALL=ALL"); - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - - /* both szPackagePath and szCommandLine are NULL */ - r = MsiInstallProductA(NULL, NULL); - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + if (0) /* crashes on Win10 1709 */ + { + r = MsiInstallProductA(NULL, "INSTALL=ALL"); + ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r); + + r = MsiInstallProductA(NULL, NULL); + ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r); + }
/* szPackagePath is empty */ r = MsiInstallProductA("", "INSTALL=ALL");
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=63292
Your paranoid android.
=== w2003std (task log) ===
Task errors: The task timed out
=== wvistau64 (task log) ===
Task errors: The task timed out
=== w7u (32 bit report) ===
msi: install: Timeout
=== w1064v1809_ar (task log) ===
Task errors: The task timed out
=== w1064v1809_he (32 bit report) ===
msi: install: Timeout
=== w1064v1809_he (task log) ===
Task errors: The task timed out
=== w1064v1809_ja (32 bit report) ===
msi: install: Timeout
=== w1064v1809_zh_CN (task log) ===
Task errors: The task timed out
=== wvistau64 (64 bit report) ===
msi: install: Timeout
Signed-off-by: Hans Leidekker hans@codeweavers.com
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=63290
Your paranoid android.
=== w2003std (task log) ===
Task errors: The task timed out
=== wvistau64 (32 bit report) ===
msi: install: Timeout
=== wvistau64 (task log) ===
Task errors: The task timed out
=== w7u (32 bit report) ===
msi: install: Timeout
=== w7u (task log) ===
Task errors: The task timed out
=== w1064v1809_ar (32 bit report) ===
msi: install: Timeout
=== w1064v1809_ar (task log) ===
Task errors: The task timed out
=== w1064v1809_he (task log) ===
Task errors: The task timed out
=== w1064v1809_ja (32 bit report) ===
msi: install: Timeout
=== w1064v1809_ja (task log) ===
Task errors: The task timed out
=== w1064v1809_zh_CN (task log) ===
Task errors: The task timed out
=== wvistau64 (64 bit report) ===
msi: install: Timeout
=== wvistau64 (task log) ===
Task errors: The task timed out
-
Hans Leidekker -
Marvin -
Zebediah Figura