https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea5d4e807ce1854cee5d9ab8f60d0c3a901715e2
commit ea5d4e807ce1854cee5d9ab8f60d0c3a901715e2 Author: winesync <[email protected]> AuthorDate: Sun Mar 13 19:05:09 2022 +0100 Commit: Mark Jansen <[email protected]> CommitDate: Sun Mar 20 19:28:26 2022 +0100 [WINESYNC] 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 <[email protected]> Signed-off-by: Hans Leidekker <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 932ed6bf84a96efa6e0169eb7c9414824eef195c by Zebediah Figura <[email protected]> --- modules/rostests/winetests/msi/install.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/rostests/winetests/msi/install.c b/modules/rostests/winetests/msi/install.c index 365f1d3a756..0bd82a621fc 100644 --- a/modules/rostests/winetests/msi/install.c +++ b/modules/rostests/winetests/msi/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);
