Skip to content

Commit ea5d4e8

Browse files
winesynclearn-more
authored andcommitted
[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]>
1 parent fb0b522 commit ea5d4e8

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

modules/rostests/winetests/msi/install.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -966,8 +966,8 @@ static const CHAR fo_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescriptio
966966
static const CHAR fo_condition_dat[] = "Feature_\tLevel\tCondition\n"
967967
"s38\ti2\tS255\n"
968968
"Condition\tFeature_\tLevel\n"
969-
"preselected\t0\tPreselected\n"
970-
"notpreselected\t0\tNOT Preselected\n";
969+
"preselected\t0\tPreselected AND NOT REMOVE\n"
970+
"notpreselected\t0\tNOT Preselected AND NOT REMOVE\n";
971971

972972
static const CHAR fo_feature_comp_dat[] = "Feature_\tComponent_\n"
973973
"s38\ts72\n"
@@ -5464,10 +5464,8 @@ static void test_feature_override(void)
54645464
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
54655465

54665466
ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n");
5467-
todo_wine {
5468-
ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n");
5469-
ok(delete_pf("msitest", FALSE), "directory removed\n");
5470-
}
5467+
ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n");
5468+
ok(!delete_pf("msitest", FALSE), "directory not removed\n");
54715469

54725470
r = MsiInstallProductA(msifile, NULL);
54735471
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -5480,10 +5478,8 @@ static void test_feature_override(void)
54805478
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
54815479

54825480
ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n");
5483-
todo_wine {
5484-
ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n");
5485-
ok(delete_pf("msitest", FALSE), "directory removed\n");
5486-
}
5481+
ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n");
5482+
ok(!delete_pf("msitest", FALSE), "directory not removed\n");
54875483

54885484
delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", access);
54895485

0 commit comments

Comments
 (0)