ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi/tests: Run the RemoveODBC action to unregister the fake drivers.

This commit is contained in:
Hans Leidekker 2010-04-13 11:15:25 +02:00 committed by Alexandre Julliard
parent 88214a72ce
commit a0ba56b3bd
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/msi/tests/install.c
View File

@ -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");