From 61cb9160637f30f892d60f42642c8c4a5ee6bb0b Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Sat, 30 Jan 2016 00:00:52 -0800 Subject: [PATCH] Revert "See if a few skips are incorrectly associated w/ aspnet/External#18" This reverts commit 6d3b5f197803f68b87fe60aecf224e46852de1f2. --- .../SerializableErrorTests.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs index 83d01a76c0..d277704f93 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Formatters.Xml; using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Mvc.FunctionalTests @@ -61,8 +62,11 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests XmlAssert.Equal(expectedXml, responseData); } - [Theory] - [MemberData(nameof(AcceptHeadersData))] + [ConditionalTheory] + // Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. Is this the same bug as aspnet/External#18??? + [FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "aspnet/External#18, DCS issue on Mono")] + [InlineData("application/xml-xmlser")] + [InlineData("application/xml-dcs")] public async Task PostedSerializableError_IsBound(string acceptHeader) { // Arrange @@ -83,8 +87,11 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests XmlAssert.Equal(expectedXml, responseData); } - [Theory] - [MemberData(nameof(AcceptHeadersData))] + [ConditionalTheory] + // Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. Is this the same bug as aspnet/External#18??? + [FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "aspnet/External#18, DCS issue on Mono")] + [InlineData("application/xml-xmlser")] + [InlineData("application/xml-dcs")] public async Task IsReturnedInExpectedFormat(string acceptHeader) { // Arrange