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

Fix Expecto TeamCity adapter #1520

Merged
merged 1 commit into from
Apr 12, 2017
Merged

Fix Expecto TeamCity adapter #1520

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions src/app/FakeLib/UnitTest/Expecto/Expecto.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ open System
open System.IO
open System.Text
open Fake
open System.Diagnostics

/// CLI parameters available if you use Tests.runTestsInAssembly defaultConfig argv in your code:
type ExpectoParams =
Expand Down Expand Up @@ -85,7 +86,8 @@ type ExpectoParams =
PrintVersion = true
Run = []
ListTests = false
Summary = true
// Summary = true somehow breakes Expecto TeamCity printer
Summary = false
SummaryLocation = false
CustomArgs = []
WorkingDirectory = ""
Expand All @@ -101,11 +103,17 @@ let Expecto (setParams : ExpectoParams -> ExpectoParams) (assemblies : string se
if isNotNullOrEmpty args.WorkingDirectory
then args.WorkingDirectory else DirectoryName testAssembly
let exitCode =
ExecProcess(fun info ->
info.FileName <- testAssembly
info.WorkingDirectory <- workingDir
info.Arguments <- argsString
) processTimeout
let info = ProcessStartInfo(testAssembly)
info.WorkingDirectory <- workingDir
info.Arguments <- argsString
info.UseShellExecute <- false
// Pass environment variables to the expecto console process in order to let it detect it's running on TeamCity
// (it checks TEAMCITY_PROJECT_NAME <> null specifically).
for name, value in environVars EnvironmentVariableTarget.Process do
info.EnvironmentVariables.[string name] <- string value
use proc = Process.Start(info)
proc.WaitForExit() // Don't set a process timeout. The timeout is per test.
proc.ExitCode
testAssembly, exitCode
let res =
assemblies
Expand Down