Skip to content

Upgrade NUnit to 3.6 #371

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
merged 2 commits into from
Feb 14, 2017
Merged

Upgrade NUnit to 3.6 #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adc927f
Upgrade NUnit to 3.6
vmuriart Feb 8, 2017
5f86154
Fix coverage w NUnit3; add OpenCover filter
vmuriart Feb 13, 2017
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ install:
script:
- export PYTHONPATH=`pwd`:$PYTHONPATH
- python -m pytest
# - mono ./packages/NUnit.*/tools/nunit-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
# - mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll

after_success:
# Uncomment if need to geninterop, ie. py37 final
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
PYTHONUNBUFFERED: True
PYTHONWARNINGS: 'ignore:::wheel.pep425tags:'
PYTHONPATH: C:\testdir
NUNIT: nunit-console
NUNIT: nunit3-console
CONDA_BLD: C:\conda
CONDA_BLD_VERSION: 3.5

Expand All @@ -35,7 +35,7 @@ init:
- set CONDA_BLD_ARCH=%PLATFORM:x=%
- set PYTHON=C:\PYTHON%PYTHON_VERSION:.=%
- if %PLATFORM%==x86 (set CONDA_BLD_ARCH=32)
- if %PLATFORM%==x86 (set NUNIT=%NUNIT%-x86)
# - if %PLATFORM%==x86 (set NUNIT=%NUNIT%-x86)
- if %PLATFORM%==x64 (set PYTHON=%PYTHON%-x64)

# Prepend newly installed Python to the PATH of this build
Expand Down
1 change: 1 addition & 0 deletions ci/appveyor_run_tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ if ($PYTHON_STATUS -ne 0) {
Write-Host ("Starting embedded tests") -ForegroundColor "Green"
.$OPENCOVER -register:user -searchdirs:"$RUNTIME_DIR" -output:cs.coverage `
-target:"$NUNIT" -targetargs:"$CS_TESTS" `
-filter:"+[*]Python.Runtime*" `
-returntargetcode
$NUNIT_STATUS = $LastExitCode
if ($NUNIT_STATUS -ne 0) {
Expand Down
4 changes: 2 additions & 2 deletions src/embed_tests/Python.EmbeddingTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/embed_tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net40" />
<package id="NUnit.Runners" version="2.6.4" targetFramework="net40" />
<package id="NUnit" version="3.6.0" targetFramework="net40" />
<package id="NUnit.ConsoleRunner" version="3.6.0" targetFramework="net40" />
</packages>