Skip to content

Run Integration Tests with CI Builds #548

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

Merged
carolynvs merged 4 commits into from
Aug 6, 2015
Merged

Run Integration Tests with CI Builds #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7936426
Execute integration tests during CI builds
carolynvs Aug 6, 2015
3f165f0
Workaround xunit bug
carolynvs Aug 6, 2015
192231f
Skip CDNtests
carolynvs Aug 6, 2015
692aef1
Convert XUnit test results to the NUnit format for easier parsing
carolynvs Aug 6, 2015
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
15 changes: 12 additions & 3 deletions build/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<NuGet>$(LocalAppData)\NuGet\NuGet.exe</NuGet>
<MSBuild>&quot;$(MSBuildToolsPath)\MSBuild.exe&quot;</MSBuild>
<XUnit>..\src\packages\xunit.runner.console.2.0.0\tools\xunit.console.exe</XUnit>
<XUnitXslt>..\src\packages\xunit.runner.console.2.0.0\tools\NUnitXml.xslt</XUnitXslt>
</PropertyGroup>

<Target Name="CI">
Expand All @@ -18,6 +19,7 @@
<CallTarget Targets="Build" />
<CallTarget Targets="Documentation" />
<CallTarget Targets="UnitTest" />
<CallTarget Targets="IntegrationTest" />
<CallTarget Targets="Package" />
</Target>

Expand Down Expand Up @@ -52,12 +54,19 @@
<MakeDir Directories="..\artifacts\TestResults\" />
<Exec Command="$(XUnit) ..\src\testing\unit\bin\$(Configuration)\OpenStackNet.Testing.Unit.dll -xml ..\artifacts\TestResults\unit-tests.xml" ContinueOnError="true" />
<Exec Command="$(MSTest) /testcontainer:..\src\testing\unit\bin\$(Configuration)\OpenStackNet.Testing.Unit.dll /category:Unit /resultsfile:..\artifacts\TestResults\unit.trx" ContinueOnError="true" />
<!--<Exec Command="$(MSTest) /testcontainer:..\src\testing\integration\bin\$(Configuration)\OpenStackNet.Testing.Integration.dll /resultsfile:..\artifacts\TestResults\integration.trx" ContinueOnError="true" WorkingDirectory="$(MSBuildThisFileDirectory)" /> -->

<!-- Convert test results to the NUnit format for easier reporting -->
<XslTransformation XmlInputPaths="..\artifacts\TestResults\unit-tests.xml" XslInputPath="$(XUnitXslt)"
OutputPaths="..\artifacts\TestResults\unit-tests.nunit.xml" />
</Target>

<Target Name="IntegrationTest" DependsOnTargets="Build">
<Error Condition=" '$(OPENSTACKNET_USER)' == '' OR '$(OPENSTACKNET_APIKEY)' == '' " Text="You must set the OPENSTACKNET_USER and OPENSTACKNET_APIKEY environment variables, logout then login in order to run the integration tests." />
<Exec Command="$(XUnit) ..\src\testing\integration\bin\$(Configuration)\OpenStackNet.Testing.Integration.dll -xml ..\artifacts\TestResults\integration-tests.xml" ContinueOnError="true" />
<MakeDir Directories="..\artifacts\TestResults\" />
<Exec Command="$(XUnit) ..\src\testing\integration\bin\$(Configuration)\OpenStackNet.Testing.Integration.dll -xml ..\artifacts\TestResults\integration-tests.xml -notrait ci=false" ContinueOnError="true" />

<!-- Convert test results to the NUnit format for easier reporting -->
<XslTransformation XmlInputPaths="..\artifacts\TestResults\integration-tests.xml" XslInputPath="$(XUnitXslt)"
OutputPaths="..\artifacts\TestResults\integration-tests.nunit.xml" />
</Target>

<Target Name="Package" DependsOnTargets="Build;Documentation">
Expand Down
1 change: 1 addition & 0 deletions src/testing/integration/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

namespace OpenStack.ContentDeliveryNetworks.v1
{
[Trait("ci","false")]
public class ContentDeliveryNetworkServiceTests
{
private readonly ContentDeliveryNetworkService _cdnService;
Expand Down
1 change: 1 addition & 0 deletions src/testing/integration/ContentDeliveryNetworks/v1/ServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace OpenStack.ContentDeliveryNetworks.v1
{
[Trait("ci","false")]
public class ServiceTests
{
private readonly ContentDeliveryNetworkService _cdnService;
Expand Down
19 changes: 16 additions & 3 deletions src/testing/integration/XunitTraceListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Diagnostics;
using System;
using System.Diagnostics;
using Xunit.Abstractions;

namespace OpenStack
Expand All @@ -17,12 +18,24 @@ public override void Write(string message)
if (message.StartsWith(OpenStackNet.Tracing.Http.Name))
return;

_testLog.WriteLine(message);
TryLog(message);
}

public override void WriteLine(string message)
{
_testLog.WriteLine(message);
TryLog(message);
}

private void TryLog(string message)
{
try
{
_testLog.WriteLine(message);
}
catch (InvalidOperationException)
{
// Unable to log to xunit because it thinks no test is active...
}
}
}
}