Merge pull request #1425 from github/task/auto-detect-tests

Meaghan Lewis · web-flow · commit 21f82b405735 · 2018-02-06T09:16:47.000-08:00
Auto detect tests in Appveyor
diff --git a/appveyor.yml b/appveyor.yml
@@ -19,8 +19,10 @@ install:
     nuget restore GitHubVS.sln
 build_script:
 - ps: scripts\build.ps1 -AppVeyor -BuildNumber:$env:APPVEYOR_BUILD_NUMBER
-test_script:
-- ps: scripts\test.ps1 -AppVeyor
+test:
+  categories:
+    except:
+      - Timings
 on_success:
 - ps: |
     if ($full_build) {
diff --git a/lib/NUnit.Extension.AppVeyor.NUnit3ResultWriter.0.1.0.nupkg b/lib/NUnit.Extension.AppVeyor.NUnit3ResultWriter.0.1.0.nupkg
diff --git a/scripts/test.ps1 b/scripts/test.ps1
@@ -18,9 +18,6 @@ Param(
     $TimeoutDuration = 180
     ,
     [switch]
-    $AppVeyor = $false
-    ,
-    [switch]
     $Trace = $false
 
 )
@@ -35,30 +32,30 @@ $env:PATH = "$PSScriptRoot;$env:PATH"
 $exitcode = 0
 
 Write-Output "Running Tracking Collection Tests..."
-Run-NUnit test TrackingCollectionTests $TimeoutDuration $config -AppVeyor:$AppVeyor
+Run-NUnit test TrackingCollectionTests $TimeoutDuration $config
 if (!$?) {
     $exitcode = 1
 }
 
 Write-Output "Running GitHub.UI.UnitTests..."
-Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
+Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config
 if (!$?) {
     $exitcode = 2
 }
 
 Write-Output "Running UnitTests..."
-Run-NUnit test UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
+Run-NUnit test UnitTests $TimeoutDuration $config
 if (!$?) {
     $exitcode = 3
 }
 
 Write-Output "Running GitHub.InlineReviews.UnitTests..."
-Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
+Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config
 if (!$?) {
     $exitcode = 4
 }
 
-if ($exitcode -ne 0 -and $AppVeyor) {
+if ($exitcode -ne 0) {
     $host.SetShouldExit($exitcode)
 }
 exit $exitcode
diff --git a/test/GitHub.InlineReviews.UnitTests/packages.config b/test/GitHub.InlineReviews.UnitTests/packages.config
@@ -10,7 +10,6 @@
   <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" />
   <package id="NSubstitute" version="2.0.3" targetFramework="net461" />
   <package id="NUnit" version="3.9.0" targetFramework="net461" />
-  <package id="NUnit.Extension.AppVeyor.NUnit3ResultWriter" version="0.1" />
   <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Runners" version="2.6.4" targetFramework="net452" />
diff --git a/test/TrackingCollectionTests/packages.config b/test/TrackingCollectionTests/packages.config
@@ -1,6 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit.Extension.AppVeyor.NUnit3ResultWriter" version="0.1" />
   <package id="NUnit" version="2.6.4" targetFramework="net452" />
   <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
diff --git a/test/UnitTests/packages.config b/test/UnitTests/packages.config
@@ -28,7 +28,6 @@
   <package id="Rothko" version="0.0.3-ghfvs" targetFramework="net461" />
   <package id="NUnit" version="3.9.0" targetFramework="net461" />
   <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
-  <package id="NUnit.Extension.AppVeyor.NUnit3ResultWriter" version="0.1" />
   <package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net461" />
   <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@ Param(`
`18`	`18`	`$TimeoutDuration = 180`
`19`	`19`	`,`
`20`	`20`	`[switch]`
`21`		`- $AppVeyor = $false`
`22`		`- ,`
`23`		`- [switch]`
`24`	`21`	`$Trace = $false`
`25`	`22`
`26`	`23`	`)`
`@@ -35,30 +32,30 @@ $env:PATH = "$PSScriptRoot;$env:PATH"`
`35`	`32`	`$exitcode = 0`
`36`	`33`
`37`	`34`	`Write-Output "Running Tracking Collection Tests..."`
`38`		`-Run-NUnit test TrackingCollectionTests $TimeoutDuration $config -AppVeyor:$AppVeyor`
	`35`	`+Run-NUnit test TrackingCollectionTests $TimeoutDuration $config`
`39`	`36`	`if (!$?) {`
`40`	`37`	`$exitcode = 1`
`41`	`38`	`}`
`42`	`39`
`43`	`40`	`Write-Output "Running GitHub.UI.UnitTests..."`
`44`		`-Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor`
	`41`	`+Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config`
`45`	`42`	`if (!$?) {`
`46`	`43`	`$exitcode = 2`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`Write-Output "Running UnitTests..."`
`50`		`-Run-NUnit test UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor`
	`47`	`+Run-NUnit test UnitTests $TimeoutDuration $config`
`51`	`48`	`if (!$?) {`
`52`	`49`	`$exitcode = 3`
`53`	`50`	`}`
`54`	`51`
`55`	`52`	`Write-Output "Running GitHub.InlineReviews.UnitTests..."`
`56`		`-Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor`
	`53`	`+Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config`
`57`	`54`	`if (!$?) {`
`58`	`55`	`$exitcode = 4`
`59`	`56`	`}`
`60`	`57`
`61`		`-if ($exitcode -ne 0 -and $AppVeyor) {`
	`58`	`+if ($exitcode -ne 0) {`
`62`	`59`	`$host.SetShouldExit($exitcode)`
`63`	`60`	`}`
`64`	`61`	`exit $exitcode`