The two ASP.NET hosted tests now result in Inconclusive when they fail to start due to an assembly load failure. I don't know why the assembly load failure occurs sometimes and not others.

2 files changed, 25 insertions, 16 deletions

diff --git a/src/DotNetOpenAuth.Test/Hosting/HostingTests.cs b/src/DotNetOpenAuth.Test/Hosting/HostingTests.cs
index ff72c66..d7de7a1 100644
--- a/src/DotNetOpenAuth.Test/Hosting/HostingTests.cs
+++ b/src/DotNetOpenAuth.Test/Hosting/HostingTests.cs
@@ -18,15 +18,19 @@ namespace DotNetOpenAuth.Test.Hosting {
 	public class HostingTests : TestBase {
 		[TestMethod]
 		public void AspHostBasicTest() {
-			using (AspNetHost host = AspNetHost.CreateHost(TestWebDirectory)) {
-				HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host.BaseUri);
-				using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) {
-					Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-					using (StreamReader sr = new StreamReader(response.GetResponseStream())) {
-						string content = sr.ReadToEnd();
-						StringAssert.Contains(content, "Test home page");
+			try {
+				using (AspNetHost host = AspNetHost.CreateHost(TestWebDirectory)) {
+					HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host.BaseUri);
+					using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) {
+						Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+						using (StreamReader sr = new StreamReader(response.GetResponseStream())) {
+							string content = sr.ReadToEnd();
+							StringAssert.Contains(content, "Test home page");
+						}
 					}
 				}
+			} catch (FileNotFoundException ex) {
+				Assert.Inconclusive("Unable to execute hosted ASP.NET tests because {0} could not be found.  {1}", ex.FileName, ex.FusionLog);
 			}
 		}
 	}
diff --git a/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs b/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
index 76a46d0..82f9ecc 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
@@ -6,6 +6,7 @@
 
 namespace DotNetOpenAuth.Test.OpenId.Provider {
 	using System;
+	using System.IO;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.OpenId;
 	using DotNetOpenAuth.OpenId.Extensions;
@@ -126,15 +127,19 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 
 		[TestMethod]
 		public void BadRequestsGenerateValidErrorResponsesHosted() {
-			using (AspNetHost host = AspNetHost.CreateHost(TestWebDirectory)) {
-				Uri opEndpoint = new Uri(host.BaseUri, "/OpenIdProviderEndpoint.ashx");
-				var rp = new OpenIdRelyingParty(null);
-				var nonOpenIdMessage = new Mocks.TestDirectedMessage();
-				nonOpenIdMessage.Recipient = opEndpoint;
-				nonOpenIdMessage.HttpMethods = HttpDeliveryMethods.PostRequest;
-				MessagingTestBase.GetStandardTestMessage(MessagingTestBase.FieldFill.AllRequired, nonOpenIdMessage);
-				var response = rp.Channel.Request<DirectErrorResponse>(nonOpenIdMessage);
-				Assert.IsNotNull(response.ErrorMessage);
+			try {
+				using (AspNetHost host = AspNetHost.CreateHost(TestWebDirectory)) {
+					Uri opEndpoint = new Uri(host.BaseUri, "/OpenIdProviderEndpoint.ashx");
+					var rp = new OpenIdRelyingParty(null);
+					var nonOpenIdMessage = new Mocks.TestDirectedMessage();
+					nonOpenIdMessage.Recipient = opEndpoint;
+					nonOpenIdMessage.HttpMethods = HttpDeliveryMethods.PostRequest;
+					MessagingTestBase.GetStandardTestMessage(MessagingTestBase.FieldFill.AllRequired, nonOpenIdMessage);
+					var response = rp.Channel.Request<DirectErrorResponse>(nonOpenIdMessage);
+					Assert.IsNotNull(response.ErrorMessage);
+				}
+			} catch (FileNotFoundException ex) {
+				Assert.Inconclusive("Unable to execute hosted ASP.NET tests because {0} could not be found.  {1}", ex.FileName, ex.FusionLog);
 			}
 		}
 	}