lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Cleaning up exceptions being thrown when the spec test web (app) host cleans up after itself

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-11-16 13:22:25 -08:00
parent 4e731d9737
commit 3561e61202
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Specs/Bindings/WebAppHosting.cs
View File

@@ -31,14 +31,14 @@ namespace Orchard.Specs.Bindings {
[BeforeTestRun]
public static void BeforeTestRun() {
if ( _orchardTemp.Exists ) {
_orchardTemp.Delete(true).CreateDirectory();
}
try { _orchardTemp.Delete(true).CreateDirectory(); } catch {}
}
[AfterTestRun]
public static void AfterTestRun() {
_orchardTemp.Delete(true); // <- try to clear any stragglers on the way out
try {
_orchardTemp.Delete(true); // <- try to clear any stragglers on the way out
} catch {}
}
[AfterScenario]

9
src/Orchard.Specs/Hosting/WebHost.cs
View File

@@ -18,17 +18,16 @@ namespace Orchard.Specs.Hosting {
}
void WebHostCleanup(object sender, EventArgs e) {
_tempSite.Delete(true); // <- try to clean up after the appdomain unloads (still not guaranteed to get everything - probably overkill - might go away)
try {
_tempSite.Delete(true); // <- try to clean up after the appdomain unloads (still not guaranteed to get everything - probably overkill - might go away)
} catch{}
}
public void Initialize(string templateName, string virtualDirectory) {
var baseDir = Path.Get(AppDomain.CurrentDomain.BaseDirectory);
_tempSite = Path.Get(_orchardTemp).Combine(System.IO.Path.GetRandomFileName());
if(_tempSite.Exists) {
_tempSite.Delete();
}
try { _tempSite.Delete(); } catch {}
_tempSite.CreateDirectory();
// Trying the two known relative paths to the Orchard.Web directory.