From fd00c2c7007f5082bca8fbac1e38eb1b21e7e743 Mon Sep 17 00:00:00 2001
From: antyadev <antyadev@gmail.com>
Date: Fri, 7 May 2021 18:46:04 +0300
Subject: [PATCH] fix blinking tests

---
 examples/FSharpDev/FSharpDev.fsproj             |  4 ++--
 src/NBomber/DomainServices/NBomberRunner.fs     |  3 ++-
 src/NBomber/DomainServices/TestHost/TestHost.fs |  9 ++++++---
 src/NBomber/NBomber.fsproj                      |  6 +++---
 tests/NBomber.IntegrationTests/StepTests.fs     | 10 +++++++---
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/examples/FSharpDev/FSharpDev.fsproj b/examples/FSharpDev/FSharpDev.fsproj
index 060063c9..b7e86548 100644
--- a/examples/FSharpDev/FSharpDev.fsproj
+++ b/examples/FSharpDev/FSharpDev.fsproj
@@ -24,13 +24,13 @@
         <Compile Include="CustomReporting\CustomReporting.fs" />
         <Compile Include="InfluxDbSink\InfluxDbSink.fs" />
         <Compile Include="InfluxDbSink\InfluxDbReportingScenario.fs" />
+        <None Include="InfluxDbSink\docker-compose.yaml" />
         <Compile Include="HttpTests\SimpleHttpTest.fs" />
         <None Include="HttpTests\infra-config.json">
           <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
         <Compile Include="ClientFactory\HttpClientFactory.fs" />
-        <Compile Include="Program.fs" />
-        <None Include="InfluxDbSink\docker-compose.yaml" />        
+        <Compile Include="Program.fs" />        
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/NBomber/DomainServices/NBomberRunner.fs b/src/NBomber/DomainServices/NBomberRunner.fs
index 9b5ebf5a..2ff707b5 100644
--- a/src/NBomber/DomainServices/NBomberRunner.fs
+++ b/src/NBomber/DomainServices/NBomberRunner.fs
@@ -9,6 +9,7 @@ open NBomber
 open NBomber.Contracts
 open NBomber.Domain
 open NBomber.Domain.HintsAnalyzer
+open NBomber.Domain.Stats
 open NBomber.DomainServices.Reporting
 open NBomber.DomainServices.TestHost
 open NBomber.Errors
@@ -67,7 +68,7 @@ let runSession (testInfo: TestInfo) (nodeInfo: NodeInfo) (context: NBomberContex
 
         let! sessionArgs  = context |> NBomberContext.createSessionArgs(testInfo)
         let! scenarios    = context |> NBomberContext.createScenarios
-        use testHost      = new TestHost(dep, scenarios, sessionArgs)
+        use testHost      = new TestHost(dep, scenarios, sessionArgs, ScenarioStatsActor.create)
         let! result       = testHost.RunSession()
         let hints         = getHints context result.NodeStats
         let simulations   = context |> getLoadSimulations
diff --git a/src/NBomber/DomainServices/TestHost/TestHost.fs b/src/NBomber/DomainServices/TestHost/TestHost.fs
index 58077883..075e5a6c 100644
--- a/src/NBomber/DomainServices/TestHost/TestHost.fs
+++ b/src/NBomber/DomainServices/TestHost/TestHost.fs
@@ -6,6 +6,7 @@ open System.Threading.Tasks
 open System.Diagnostics
 open System.Runtime.InteropServices
 
+open Serilog
 open FSharp.Control.Tasks.NonAffine
 open FsToolkit.ErrorHandling
 
@@ -13,7 +14,6 @@ open NBomber.Contracts
 open NBomber.Errors
 open NBomber.Domain
 open NBomber.Domain.DomainTypes
-open NBomber.Domain.Stats
 open NBomber.Domain.Concurrency.ScenarioActor
 open NBomber.Domain.Concurrency.Scheduler.ScenarioScheduler
 open NBomber.Infra.Dependency
@@ -21,7 +21,10 @@ open NBomber.DomainServices
 open NBomber.DomainServices.NBomberContext
 open NBomber.DomainServices.TestHost.TestHostReporting
 
-type internal TestHost(dep: IGlobalDependency, registeredScenarios: Scenario list, sessionArgs: SessionArgs) as this =
+type internal TestHost(dep: IGlobalDependency,
+                       registeredScenarios: Scenario list,
+                       sessionArgs: SessionArgs,
+                       createStatsActor: ILogger * Scenario -> MailboxProcessor<_>) as this =
 
     let mutable _stopped = false
     let mutable _targetScenarios = List.empty<Scenario>
@@ -53,7 +56,7 @@ type internal TestHost(dep: IGlobalDependency, registeredScenarios: Scenario lis
                 CancellationToken = cancelToken
                 GlobalTimer = Stopwatch()
                 Scenario = scn
-                ScenarioStatsActor = ScenarioStatsActor.create(dep.Logger, scn)
+                ScenarioStatsActor = createStatsActor(dep.Logger, scn)
                 ExecStopCommand = execStopCommand
             }
             new ScenarioScheduler(actorDep)
diff --git a/src/NBomber/NBomber.fsproj b/src/NBomber/NBomber.fsproj
index 69447008..2ca6e0c0 100644
--- a/src/NBomber/NBomber.fsproj
+++ b/src/NBomber/NBomber.fsproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Authors>PragmaticFlow</Authors>
-        <Company>PragmaticFlow</Company>
+        <Authors>NBomber</Authors>
+        <Company>NBomber</Company>
         <Version>2.0.0-rc4</Version>
-        <Copyright>PragmaticFlow@2021</Copyright>
+        <Copyright>NBomber@2021</Copyright>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <PackageIcon>nbomber_icon.png</PackageIcon>
         <PackageProjectUrl>https://github.com/PragmaticFlow/NBomber</PackageProjectUrl>
diff --git a/tests/NBomber.IntegrationTests/StepTests.fs b/tests/NBomber.IntegrationTests/StepTests.fs
index ee9c10bb..4ae48c38 100644
--- a/tests/NBomber.IntegrationTests/StepTests.fs
+++ b/tests/NBomber.IntegrationTests/StepTests.fs
@@ -253,7 +253,7 @@ let ``NBomber should allow to set custom response latency and handle it properly
                  |> Seq.find(fun x -> x.StepName = "step")
 
         test <@ st.Ok.Request.Count > 5 @>
-        test <@ st.Ok.Request.RPS >= 9.0 @>
+        test <@ st.Ok.Request.RPS >= 7.0 @>
         test <@ st.Ok.Latency.MinMs <= 2_001.0 @>
 
 [<Fact>]
@@ -318,8 +318,8 @@ let ``NBomber should handle invocation number per step following shared-nothing
     let data = Dictionary<int,int>()
 
     let step = Step.create("step", timeout = seconds 2, execute = fun context -> task {
-
         do! Task.Delay(seconds 1, context.CancellationToken)
+
         data.[context.ScenarioInfo.ThreadNumber] <- context.InvocationCount
 
         return Response.ok()
@@ -333,7 +333,11 @@ let ``NBomber should handle invocation number per step following shared-nothing
     |> NBomberRunner.run
     |> ignore
 
-    let maxNumber = data.Values |> Seq.toArray |> Array.maxBy(id)
+    // hack to fix the issue with iterating over mutable dictionary
+    // it show up on slow machine
+    Task.Delay(seconds 10).Wait()
+
+    let maxNumber = data.Values |> Seq.maxBy(id)
 
     test <@ maxNumber >= 5 && maxNumber <= 11 @>