Module: wine Branch: master Commit: a0ba56b3bd863cc0215ae53c0bf4148c1df5ce9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ba56b3bd863cc0215ae53c0b...
Author: Hans Leidekker hans@codeweavers.com Date: Tue Apr 13 11:15:25 2010 +0200
msi/tests: Run the RemoveODBC action to unregister the fake drivers.
---
dlls/msi/tests/install.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index c1a0a84..0bf7a6a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1310,9 +1310,14 @@ static const CHAR odbc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" "InstallODBC\t\t3000\n" "RemoveODBC\t\t3100\n" + "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n";
static const CHAR odbc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" @@ -8717,12 +8722,21 @@ static void test_install_remove_odbc(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
- ok(delete_pf("msitest\ODBCdriver.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest\ODBCdriver2.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest\ODBCtranslator.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest\ODBCtranslator2.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest\ODBCsetup.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest", FALSE), "directory not created\n"); + ok(pf_exists("msitest\ODBCdriver.dll"), "file not created\n"); + ok(pf_exists("msitest\ODBCdriver2.dll"), "file not created\n"); + ok(pf_exists("msitest\ODBCtranslator.dll"), "file not created\n"); + ok(pf_exists("msitest\ODBCtranslator2.dll"), "file not created\n"); + ok(pf_exists("msitest\ODBCsetup.dll"), "file not created\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\ODBCdriver.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\ODBCdriver2.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\ODBCtranslator.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\ODBCtranslator2.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\ODBCsetup.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n");
DeleteFileA("msitest\ODBCdriver.dll"); DeleteFileA("msitest\ODBCdriver2.dll");
-
Alexandre Julliard