From a543e60dc9aef92837b71432dbd816560d8a104f Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Wed, 9 May 2007 20:13:45 +0200 Subject: [PATCH] msi/tests: Properly cleanup after each test. --- dlls/msi/tests/install.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index d3493716025..b0bccf95e4d 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1406,7 +1406,10 @@ static void test_setdirproperty(void) ok(delete_pf("Common Files\\msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("Common Files\\msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ DeleteFile(msifile); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); } static void test_cabisextracted(void) @@ -1435,8 +1438,14 @@ static void test_cabisextracted(void) ok(delete_pf("msitest\\gaius", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ delete_cab_files(); DeleteFile(msifile); + DeleteFile("maximus"); + DeleteFile("augustus"); + DeleteFile("caesar"); + DeleteFile("msitest\\gaius"); + RemoveDirectory("msitest"); } static void test_concurrentinstall(void) @@ -1463,7 +1472,13 @@ static void test_concurrentinstall(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ DeleteFile(msifile); + DeleteFile(path); + DeleteFile("msitest\\msitest\\augustus"); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest\\msitest"); + RemoveDirectory("msitest"); } static void test_setpropertyfolder(void) @@ -1483,7 +1498,10 @@ static void test_setpropertyfolder(void) ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ DeleteFile(msifile); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); } START_TEST(install)