fix qgsauthmanager test on windows

jef-n · jef-n · commit 85f29ed83f61 · 2015-11-19T11:51:15.000+01:00
(cherry picked from commit 0799e09)
diff --git a/tests/src/core/testqgsauthmanager.cpp b/tests/src/core/testqgsauthmanager.cpp
@@ -136,16 +136,16 @@ void TestQgsAuthManager::cleanupTempDir()
   {
     Q_FOREACH ( const QString &tf, tmpDir.entryList( QDir::NoDotAndDotDot | QDir::Files ) )
     {
-      QVERIFY( tmpDir.remove( mTempDir + "/" + tf ) );
+      QVERIFY2( tmpDir.remove( mTempDir + "/" + tf ), qPrintable( "Could not remove " + mTempDir + "/" + tf ) );
     }
-    QVERIFY( tmpDir.rmdir( mTempDir ) );
+    QVERIFY2( tmpDir.rmdir( mTempDir ), qPrintable( "Could not remove directory " + mTempDir ) );
   }
 }
 
 void TestQgsAuthManager::cleanupTestCase()
 {
-  cleanupTempDir();
   QgsApplication::exitQgis();
+  cleanupTempDir();
 
   QString myReportFile = QDir::tempPath() + "/qgistest.html";
   QFile myFile( myReportFile );

Original file line number	Diff line number	Diff line change
`@@ -136,16 +136,16 @@ void TestQgsAuthManager::cleanupTempDir()`
`136`	`136`	`{`
`137`	`137`	`Q_FOREACH ( const QString &tf, tmpDir.entryList( QDir::NoDotAndDotDot \| QDir::Files ) )`
`138`	`138`	`{`
`139`		`- QVERIFY( tmpDir.remove( mTempDir + "/" + tf ) );`
	`139`	`+ QVERIFY2( tmpDir.remove( mTempDir + "/" + tf ), qPrintable( "Could not remove " + mTempDir + "/" + tf ) );`
`140`	`140`	`}`
`141`		`- QVERIFY( tmpDir.rmdir( mTempDir ) );`
	`141`	`+ QVERIFY2( tmpDir.rmdir( mTempDir ), qPrintable( "Could not remove directory " + mTempDir ) );`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`void TestQgsAuthManager::cleanupTestCase()`
`146`	`146`	`{`
`147`		`- cleanupTempDir();`
`148`	`147`	`QgsApplication::exitQgis();`
	`148`	`+ cleanupTempDir();`
`149`	`149`
`150`	`150`	`QString myReportFile = QDir::tempPath() + "/qgistest.html";`
`151`	`151`	`QFile myFile( myReportFile );`