Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Xharness] Fix all xml parsing issues and ensure that the xml can be consumed by VSTS. #7768

Merged
merged 25 commits into from
Feb 4, 2020
Merged

[Xharness] Fix all xml parsing issues and ensure that the xml can be consumed by VSTS. #7768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f9295ba
[Xharness] Ignore the first line from the xml logs that is a ping.
mandel-macaque Jan 29, 2020
277d989
Apply suggestions from code review
mandel-macaque Jan 29, 2020
c7a27d6
Do not throw exception, got to pos 0.
mandel-macaque Jan 29, 2020
f08c464
Merge branch 'ping-in-logs' of github.com:xamarin/xamarin-macios into…
mandel-macaque Jan 29, 2020
12c625d
Add logging when we cannot parse the data.
mandel-macaque Jan 29, 2020
d118a6b
Copy over Move in case we continue writing to the same fd. Move printing
mandel-macaque Jan 30, 2020
8d08117
Ignore extra nodes from TouchUnit.
mandel-macaque Jan 30, 2020
0193f25
Use a socket over a stream.
mandel-macaque Jan 31, 2020
1942c11
Do not write the line twice, that is a mistake.
mandel-macaque Jan 31, 2020
1c6d64b
We are not writting the root node on xunit.
mandel-macaque Jan 31, 2020
acf634c
Undo the changees in the listener.
mandel-macaque Jan 31, 2020
ec957ea
Fix NUnit failure parsing.
mandel-macaque Jan 31, 2020
77c1d98
Use two file formats and do not trust the xslt which gives problems in
mandel-macaque Jan 31, 2020
0dda135
Fix simpler listener.
mandel-macaque Jan 31, 2020
a6d9eb2
Renaming the files wont work, we have to be smarter. Leave it for a d…
mandel-macaque Jan 31, 2020
361a3af
Fix issues for device tests and xml.
mandel-macaque Feb 2, 2020
6546e7c
Use the correct path for the upload.
mandel-macaque Feb 2, 2020
2dbacdc
Remove xml junk trying to fix https://github.com/xamarin/maccore/issu…
mandel-macaque Feb 2, 2020
adc5b0c
Do not trust NUnitLite xml writer. It writes bad formed xml with cate…
mandel-macaque Feb 2, 2020
da943bc
Add missing file to template csproj.
mandel-macaque Feb 2, 2020
52dd4af
Fix badly formed xunit xml.
mandel-macaque Feb 3, 2020
0868d5a
Several parsing fixes:
mandel-macaque Feb 4, 2020
de960c0
Add forgotten file for tvOs tests.
mandel-macaque Feb 4, 2020
e65cc7a
We need to not read the ping.
mandel-macaque Feb 4, 2020
0b823ab
VSTS does not line the touch unit format and will throw the following
mandel-macaque Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions tests/bcl-test/BCLTests-mac.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,16 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Memory" Version="4.5.2" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
<PackageReference Include="System.Buffers" Version="4.4.0" />
<PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
<PackageReference Include="xunit.runner.utility" Version="2.4.0" />


</ItemGroup>
<ItemGroup>
<Reference Include="System">
Expand Down Expand Up @@ -99,6 +101,9 @@
<Compile Include="templates\common\TestRunner.NUnit\ClassOrNamespaceFilter.cs">
<Link>TestRunner.NUnit\ClassOrNamespaceFilter.cs</Link>
</Compile>
<Compile Include="templates\common\TestRunner.NUnit\XmlOutputWriter.cs">
<Link>TestRunner.NUnit\XmlOutputWriter.cs</Link>
</Compile>
<Compile Include="templates\common\TestRunner.NUnit\TestMethodFilter.cs">
<Link>TestRunner.NUnit\TestMethodFilter.cs</Link>
</Compile>
Expand Down
19 changes: 11 additions & 8 deletions tests/bcl-test/BCLTests-tv.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@
<MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
<PackageReference Include="System.Buffers" Version="4.4.0" />
<PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="Mono.Options" Version="6.6.0.161" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
<PackageReference Include="xunit.runner.utility" Version="2.4.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.utility" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -176,6 +176,9 @@
<Compile Include="templates\common\TestRunner.NUnit\TestMethodFilter.cs">
<Link>TestRunner.NUnit\TestMethodFilter.cs</Link>
</Compile>
<Compile Include="templates\common\TestRunner.NUnit\XmlOutputWriter.cs">
<Link>TestRunner.NUnit\XmlOutputWriter.cs</Link>
</Compile>
<Compile Include="templates\common\TestRunner.Core\Extensions.Bool.cs">
<Link>TestRunner.Core\Extensions.Bool.cs</Link>
</Compile>
Expand Down
19 changes: 11 additions & 8 deletions tests/bcl-test/BCLTests-watchos-extension.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
<PackageReference Include="System.Buffers" Version="4.4.0" />
<PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="Mono.Options" Version="6.6.0.161" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
<PackageReference Include="xunit.runner.utility" Version="2.4.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.utility" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -206,6 +206,9 @@
<Compile Include="templates\common\TestRunner.NUnit\TestMethodFilter.cs">
<Link>TestRunner.NUnit\TestMethodFilter.cs</Link>
</Compile>
<Compile Include="templates\common\TestRunner.NUnit\XmlOutputWriter.cs">
<Link>TestRunner.NUnit\XmlOutputWriter.cs</Link>
</Compile>
<Compile Include="templates\common\TestRunner.xUnit\XUnitFilter.cs">
<Link>TestRunner.xUnit\XUnitFilter.cs</Link>
</Compile>
Expand Down
19 changes: 11 additions & 8 deletions tests/bcl-test/BCLTests.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@
<MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
<PackageReference Include="System.Buffers" Version="4.4.0" />
<PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="Mono.Options" Version="6.6.0.161" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
<PackageReference Include="xunit.runner.utility" Version="2.4.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.utility" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -189,6 +189,9 @@
<Compile Include="templates\common\TestRunner.NUnit\TestMethodFilter.cs">
<Link>TestRunner.NUnit\TestMethodFilter.cs</Link>
</Compile>
<Compile Include="templates\common\TestRunner.NUnit\XmlOutputWriter.cs">
<Link>TestRunner.NUnit\XmlOutputWriter.cs</Link>
</Compile>
<Compile Include="templates\common\TestRunner.Core\Extensions.Bool.cs">
<Link>TestRunner.Core\Extensions.Bool.cs</Link>
</Compile>
Expand Down
2 changes: 0 additions & 2 deletions tests/bcl-test/templates/common/TestRunner.NUnit/NUnitTestRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@

using Foundation;

using NUnitLite.Runner;
using NUnit.Framework.Api;
using NUnit.Framework.Internal;
using NUnit.Framework.Internal.WorkItems;
using NUnit.Framework.Internal.Filters;

using NUnitTest = NUnit.Framework.Internal.Test;
Expand Down
Loading