Commit f29ec238 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

msi: Delete any databases we create at the end of each test.

parent 53041d8f
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include "wine/test.h" #include "wine/test.h"
static const char msifile[] = "winetest.msi";
static UINT run_query( MSIHANDLE hdb, const char *query ) static UINT run_query( MSIHANDLE hdb, const char *query )
{ {
MSIHANDLE hview = 0; MSIHANDLE hview = 0;
...@@ -92,13 +94,12 @@ static UINT set_summary_info(MSIHANDLE hdb) ...@@ -92,13 +94,12 @@ static UINT set_summary_info(MSIHANDLE hdb)
MSIHANDLE create_package_db(void) MSIHANDLE create_package_db(void)
{ {
MSIHANDLE hdb = 0; MSIHANDLE hdb = 0;
CHAR szName[] = "winetest.msi";
UINT res; UINT res;
DeleteFile(szName); DeleteFile(msifile);
/* create an empty database */ /* create an empty database */
res = MsiOpenDatabase(szName, MSIDBOPEN_CREATE, &hdb ); res = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb );
ok( res == ERROR_SUCCESS , "Failed to create database\n" ); ok( res == ERROR_SUCCESS , "Failed to create database\n" );
if( res != ERROR_SUCCESS ) if( res != ERROR_SUCCESS )
return hdb; return hdb;
...@@ -145,6 +146,7 @@ static void test_createpackage(void) ...@@ -145,6 +146,7 @@ static void test_createpackage(void)
res = MsiCloseHandle( hPackage); res = MsiCloseHandle( hPackage);
ok( res == ERROR_SUCCESS , "Failed to close package\n" ); ok( res == ERROR_SUCCESS , "Failed to close package\n" );
DeleteFile(msifile);
} }
static void test_getsourcepath_bad( void ) static void test_getsourcepath_bad( void )
...@@ -270,6 +272,7 @@ static void test_getsourcepath( void ) ...@@ -270,6 +272,7 @@ static void test_getsourcepath( void )
} }
MsiCloseHandle( hpkg ); MsiCloseHandle( hpkg );
DeleteFile(msifile);
} }
static void test_doaction( void ) static void test_doaction( void )
...@@ -293,6 +296,7 @@ static void test_doaction( void ) ...@@ -293,6 +296,7 @@ static void test_doaction( void )
ok( r == ERROR_FUNCTION_NOT_CALLED, "wrong return val\n"); ok( r == ERROR_FUNCTION_NOT_CALLED, "wrong return val\n");
MsiCloseHandle( hpkg ); MsiCloseHandle( hpkg );
DeleteFile(msifile);
} }
static void test_gettargetpath_bad(void) static void test_gettargetpath_bad(void)
...@@ -324,6 +328,7 @@ static void test_gettargetpath_bad(void) ...@@ -324,6 +328,7 @@ static void test_gettargetpath_bad(void)
ok( r == ERROR_DIRECTORY, "wrong return val\n"); ok( r == ERROR_DIRECTORY, "wrong return val\n");
MsiCloseHandle( hpkg ); MsiCloseHandle( hpkg );
DeleteFile(msifile);
} }
static void test_settargetpath_bad(void) static void test_settargetpath_bad(void)
...@@ -713,6 +718,7 @@ static void test_condition(void) ...@@ -713,6 +718,7 @@ static void test_condition(void)
ok( r == MSICONDITION_TRUE, "wrong return val\n"); ok( r == MSICONDITION_TRUE, "wrong return val\n");
MsiCloseHandle( hpkg ); MsiCloseHandle( hpkg );
DeleteFile(msifile);
} }
static BOOL check_prop_empty( MSIHANDLE hpkg, char * prop) static BOOL check_prop_empty( MSIHANDLE hpkg, char * prop)
...@@ -835,6 +841,7 @@ static void test_props(void) ...@@ -835,6 +841,7 @@ static void test_props(void)
ok( sz == 3, "wrong size returned\n"); ok( sz == 3, "wrong size returned\n");
MsiCloseHandle( hpkg ); MsiCloseHandle( hpkg );
DeleteFile(msifile);
} }
START_TEST(package) START_TEST(package)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment