Paul Vriens : msi/tests: Properly cleanup after each test.

Alexandre Julliard julliard at wine.codeweavers.com
Thu May 10 07:49:52 CDT 2007


Module: wine
Branch: master
Commit: a543e60dc9aef92837b71432dbd816560d8a104f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a543e60dc9aef92837b71432dbd816560d8a104f

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Wed May  9 20:13:45 2007 +0200

msi/tests: Properly cleanup after each test.

---

 dlls/msi/tests/install.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index d349371..b0bccf9 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)




More information about the wine-cvs mailing list