Skip to content

Commit 11d49cb

Browse files
Fix tests
1 parent a3cdee3 commit 11d49cb

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ test-fsharp:
188188
@echo "==> Running Napper.Core tests with coverage..."
189189
dotnet test src/Napper.Core.Tests --nologo \
190190
--settings src/Napper.Core.Tests/coverage.runsettings \
191-
--results-directory "$(FSHARP_COVERAGE_DIR)/raw"
191+
--results-directory "$(FSHARP_COVERAGE_DIR)/raw" \
192+
--logger "console;verbosity=detailed"
192193
@echo "==> Generating Napper.Core coverage report..."
193194
reportgenerator \
194195
-reports:"$(FSHARP_COVERAGE_DIR)/raw/*/coverage.cobertura.xml" \
@@ -225,7 +226,8 @@ test: build-cli
225226
@echo "==> Running Napper.Core tests with coverage..."
226227
dotnet test src/Napper.Core.Tests --nologo \
227228
--settings src/Napper.Core.Tests/coverage.runsettings \
228-
--results-directory "$(FSHARP_COVERAGE_DIR)/raw"
229+
--results-directory "$(FSHARP_COVERAGE_DIR)/raw" \
230+
--logger "console;verbosity=detailed"
229231
@echo "==> Generating Napper.Core coverage report..."
230232
reportgenerator \
231233
-reports:"$(FSHARP_COVERAGE_DIR)/raw/*/coverage.cobertura.xml" \

src/Napper.Core.Tests/TestHelpers.fs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ let NapperBinaryName = "napper"
1111

1212
// --- CLI runner: uses the installed binary, never recompiles ---
1313

14+
let private logLock = obj ()
15+
16+
let log (msg: string) =
17+
lock logLock (fun () ->
18+
Console.Error.WriteLine(msg)
19+
Console.Error.Flush())
20+
1421
let private findNapper () : string =
1522
let localBin =
1623
Path.Combine(
@@ -24,6 +31,8 @@ let private findNapper () : string =
2431

2532
let runCli (args: string) (cwd: string) : int * string * string =
2633
let binary = findNapper ()
34+
let sw = Stopwatch.StartNew()
35+
log $"[runCli] START %s{args}"
2736
let psi = ProcessStartInfo()
2837
psi.FileName <- binary
2938
psi.Arguments <- args
@@ -33,9 +42,12 @@ let runCli (args: string) (cwd: string) : int * string * string =
3342
psi.UseShellExecute <- false
3443
psi.CreateNoWindow <- true
3544
use proc = Process.Start(psi)
45+
let stderrTask = proc.StandardError.ReadToEndAsync()
3646
let stdout = proc.StandardOutput.ReadToEnd()
37-
let stderr = proc.StandardError.ReadToEnd()
47+
let stderr = stderrTask.Result
3848
proc.WaitForExit()
49+
sw.Stop()
50+
log $"[runCli] DONE %s{args} exit=%d{proc.ExitCode} elapsed=%d{sw.ElapsedMilliseconds}ms"
3951
proc.ExitCode, stdout, stderr
4052

4153
// --- Temp directory helpers ---

0 commit comments

Comments
 (0)