fixup! Minor changes to DirectoryHelper.DeleteDirectory()

nulltoken · nulltoken · commit bc475827338a · 2015-02-24T08:02:06.000+01:00
diff --git a/LibGit2Sharp.Tests/TestHelpers/DirectoryHelper.cs b/LibGit2Sharp.Tests/TestHelpers/DirectoryHelper.cs
@@ -85,9 +85,9 @@ private static void TryDeleteDirectory(string directoryPath, int maxAttempts, in
                 }
                 catch (Exception ex)
                 {
-                    var exceptionType = ex.GetType();
+                    var caughtExceptionType = ex.GetType();
 
-                    if (!whitelist.Any(e => exceptionType.IsAssignableFrom(e)))
+                    if (!whitelist.Any(knownExceptionType => knownExceptionType.IsAssignableFrom(caughtExceptionType)))
                     {
                         throw;
                     }
@@ -104,7 +104,7 @@ private static void TryDeleteDirectory(string directoryPath, int maxAttempts, in
                                                   "{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +
                                                   "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus)" +
                                                   "{0}- TortoiseGit (change the 'Icon Overlays' settings, e.g., adding the bin folder of LibGit2Sharp.Tests to 'Exclude paths' and appending an '*' to exclude all subfolders as well)",
-                        Environment.NewLine, Path.GetFullPath(directoryPath), maxAttempts, exceptionType, ex.Message));
+                        Environment.NewLine, Path.GetFullPath(directoryPath), maxAttempts, caughtExceptionType, ex.Message));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,9 @@ private static void TryDeleteDirectory(string directoryPath, int maxAttempts, in`
`85`	`85`	`}`
`86`	`86`	`catch (Exception ex)`
`87`	`87`	`{`
`88`		`- var exceptionType = ex.GetType();`
	`88`	`+ var caughtExceptionType = ex.GetType();`
`89`	`89`
`90`		`- if (!whitelist.Any(e => exceptionType.IsAssignableFrom(e)))`
	`90`	`+ if (!whitelist.Any(knownExceptionType => knownExceptionType.IsAssignableFrom(caughtExceptionType)))`
`91`	`91`	`{`
`92`	`92`	`throw;`
`93`	`93`	`}`
`@@ -104,7 +104,7 @@ private static void TryDeleteDirectory(string directoryPath, int maxAttempts, in`
`104`	`104`	`"{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +`
`105`	`105`	`"{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus)" +`
`106`	`106`	`"{0}- TortoiseGit (change the 'Icon Overlays' settings, e.g., adding the bin folder of LibGit2Sharp.Tests to 'Exclude paths' and appending an '*' to exclude all subfolders as well)",`
`107`		`- Environment.NewLine, Path.GetFullPath(directoryPath), maxAttempts, exceptionType, ex.Message));`
	`107`	`+ Environment.NewLine, Path.GetFullPath(directoryPath), maxAttempts, caughtExceptionType, ex.Message));`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`