Rename NUnit vars to generic names

vmuriart · vmuriart · commit c64e34e3a1b4 · 2017-02-16T19:26:13.000-07:00
Makes it easier to switch test-runners in the future.
Note the if section is being skipped for NUnit3, but leaving it
in case needed to rollback to NUnit2, or upgrade to XUnit
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,7 +10,6 @@ environment:
     PYTHONUNBUFFERED: True
     PYTHONWARNINGS: 'ignore:::wheel.pep425tags:'
     PYTHONPATH: C:\testdir
-    NUNIT: nunit3-console
     CONDA_BLD: C:\miniconda35
 
   matrix:
@@ -29,7 +28,6 @@ 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%==x64 (set PYTHON=%PYTHON%-x64)
   - if %PLATFORM%==x64 (set CONDA_BLD=%CONDA_BLD%-x64)
 
diff --git a/ci/appveyor_run_tests.ps1 b/ci/appveyor_run_tests.ps1
@@ -1,9 +1,17 @@
-# Script to simplify appveyor configuration and resolve path to tools
+# Script to simplify AppVeyor configuration and resolve path to tools
+
+# Test Runner framework being used for embedded tests
+$CS_RUNNER = "nunit3-console"
+
+# Needed for ARCH specific runners(NUnit2/XUnit3). Skip for NUnit3
+if ($FALSE -and $env:PLATFORM -eq "x86"){
+    $CS_RUNNER = $CS_RUNNER + "-x86"
+}
 
 # Executable paths for OpenCover
 # Note if OpenCover fails, it won't affect the exit codes.
 $OPENCOVER = Resolve-Path .\packages\OpenCover.*\tools\OpenCover.Console.exe
-$NUNIT = Resolve-Path .\packages\NUnit.*\tools\"$env:NUNIT".exe
+$CS_RUNNER = Resolve-Path .\packages\NUnit.*\tools\"$CS_RUNNER".exe
 $PY = Get-Command python
 
 # Can't use ".\build\*\Python.EmbeddingTest.dll". Missing framework files.
@@ -27,16 +35,16 @@ if ($PYTHON_STATUS -ne 0) {
 # Powershell options splatting: http://stackoverflow.com/a/24313253/5208670
 Write-Host ("Starting embedded tests") -ForegroundColor "Green"
 .$OPENCOVER -register:user -searchdirs:"$RUNTIME_DIR" -output:cs.coverage `
-            -target:"$NUNIT" -targetargs:"$CS_TESTS" `
+            -target:"$CS_RUNNER" -targetargs:"$CS_TESTS" `
             -filter:"+[*]Python.Runtime*" `
             -returntargetcode
-$NUNIT_STATUS = $LastExitCode
-if ($NUNIT_STATUS -ne 0) {
+$CS_STATUS = $LastExitCode
+if ($CS_STATUS -ne 0) {
     Write-Host "Embedded tests failed" -ForegroundColor "Red"
 }
 
 # Set exit code to fail if either Python or Embedded tests failed
-if ($PYTHON_STATUS -ne 0 -or $NUNIT_STATUS -ne 0) {
+if ($PYTHON_STATUS -ne 0 -or $CS_STATUS -ne 0) {
     Write-Host "Tests failed" -ForegroundColor "Red"
     $host.SetShouldExit(1)
 }
