More elegant test hack

tests/CallPolly.Acceptance/Scenarios.fs

@@ -15,12 +15,6 @@ module Helpers =
     let s x = TimeSpan.FromSeconds (float x)
     let between min max (value : float) = value >= min && value <= max
 
-type SerilogHelpers.LogCaptureBuffer with
-    member buffer.Take() =
-        let actual = [for x in buffer.Entries -> x.RenderMessage()]
-        buffer.Clear()
-        actual
-
 let policy = """{
     "services": {
         "ingres": {
@@ -262,9 +256,12 @@ type Scenarios(output : Xunit.Abstractions.ITestOutputHelper) =
         test <@ between 0.3 2. (let t = time.Elapsed in t.TotalSeconds) @>
     }
 
-    let readDefinitions () = policy
-    // Uncomment to read from, or debug using a custom policy
-    //let readDefinitions () = System.Environment.GetEnvironmentVariable "CALL_POLICY" |> System.IO.File.ReadAllText
+    let readDefinitions () =
+        let filename = System.Environment.GetEnvironmentVariable "CALL_POLICY"
+        // Uncomment as a test hack!
+        //let filename = "c:\code\CALL_POLICIES"
+        if filename <> null && System.IO.File.Exists filename then System.IO.File.ReadAllText filename
+        else policy
 
     let renderAsPrettyJson x = Parser.Newtonsoft.Serialize(x, Parser.Newtonsoft.indentSettings)
 

tests/CallPolly.Tests/Infrastructure.fs

@@ -71,6 +71,7 @@ module Choice =
 module SerilogHelpers =
     open Serilog
     open Serilog.Events
+    open System.Collections.Concurrent
 
     /// Create a logger, targeting the specified outputs
     [<NoComparison>]
@@ -96,12 +97,16 @@ module SerilogHelpers =
         interface Serilog.Core.ILogEventSink with member __.Emit logEvent = writeSerilogEvent logEvent
 
     type LogCaptureBuffer() =
-        let captured = ResizeArray()
+        let captured = ConcurrentQueue()
         let capture (logEvent: LogEvent) =
-            captured.Add logEvent
+            captured.Enqueue logEvent
         interface Serilog.Core.ILogEventSink with member __.Emit logEvent = capture logEvent
         member __.Clear () = captured.Clear()
         member __.Entries = captured.ToArray()
+        member __.Take() =
+            let actual = [for x in __.Entries -> x.RenderMessage()]
+            __.Clear()
+            actual
 
     let (|SerilogScalar|_|) : Serilog.Events.LogEventPropertyValue -> obj option = function
         | (:? ScalarValue as x) -> Some x.Value