Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 11:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi/tests: Fix test_feature_override() to properly clean up its features on removal.

Browse source 
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>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 932ed6bf84a96efa6e0169eb7c9414824eef195c by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-13 19:05:09 +01:00 committed by Mark Jansen
parent fb0b52255c
commit ea5d4e807c
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/rostests/winetests/msi/install.c
View file

@ -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" static const CHAR fo_condition_dat[] = "Feature_\tLevel\tCondition\n"
"s38\ti2\tS255\n" "s38\ti2\tS255\n"
"Condition\tFeature_\tLevel\n" "Condition\tFeature_\tLevel\n"
"preselected\t0\tPreselected\n" "preselected\t0\tPreselected AND NOT REMOVE\n"
"notpreselected\t0\tNOT Preselected\n"; "notpreselected\t0\tNOT Preselected AND NOT REMOVE\n";
static const CHAR fo_feature_comp_dat[] = "Feature_\tComponent_\n" static const CHAR fo_feature_comp_dat[] = "Feature_\tComponent_\n"
"s38\ts72\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(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n");
todo_wine { ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n");
ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n");
ok(delete_pf("msitest", FALSE), "directory removed\n");
}
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); 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(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n");
todo_wine { ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n");
ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n");
ok(delete_pf("msitest", FALSE), "directory removed\n");
}
delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", access); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", access);