added IBaseContext.GetNodeInfo: unit -> NodeInfo

PragmaticFlow · Aug 1, 2022 · cb648f0 · cb648f0
1 parent 882a24e
commit cb648f0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/NBomber/Domain/Scenario.fs b/src/NBomber/Domain/Scenario.fs
@@ -158,7 +158,7 @@ module ScenarioContext =
  let create (context: IBaseContext) = {
  new IScenarioContext with
  member _.TestInfo = context.TestInfo
- member _.NodeInfo = context.NodeInfo
+ member _.NodeInfo = context.GetNodeInfo()
  member _.CustomSettings = ConfigurationBuilder().Build() :> IConfiguration
  member _.CancellationToken = context.CancellationToken
  member _.Logger = context.Logger

diff --git a/src/NBomber/DomainServices/NBomberContext.fs b/src/NBomber/DomainServices/NBomberContext.fs
@@ -320,10 +320,9 @@ let createSessionArgs (testInfo: TestInfo) (scenarios: DomainTypes.Scenario list
 let createScenarios (context: NBomberContext) =
  context.RegisteredScenarios |> Scenario.createScenarios
 
-let createBaseContext (testInfo, nodeInfo, token, logger) = {
- new IBaseContext with
+let createBaseContext (testInfo, getNodeInfo: unit -> NodeInfo, token, logger) =
+ { new IBaseContext with
  member _.TestInfo = testInfo
- member _.NodeInfo = nodeInfo
+ member _.GetNodeInfo() = getNodeInfo()
  member _.CancellationToken = token
- member _.Logger = logger
-}
+ member _.Logger = logger }
diff --git a/src/NBomber/DomainServices/TestHost/TestHost.fs b/src/NBomber/DomainServices/TestHost/TestHost.fs
@@ -93,7 +93,7 @@ type internal TestHost(dep: IGlobalDependency,
 
  let targetScenarios = regScenarios |> TestHostScenario.getTargetScenarios sessionArgs
 
- let baseContext = NBomberContext.createBaseContext(sessionArgs.TestInfo, getCurrentNodeInfo(), cancelToken, _log)
+ let baseContext = NBomberContext.createBaseContext(sessionArgs.TestInfo, getCurrentNodeInfo, cancelToken, _log)
  let defaultScnContext = Scenario.ScenarioContext.create baseContext
 
  do! dep.WorkerPlugins |> WorkerPlugins.init dep baseContext
@@ -136,7 +136,7 @@ type internal TestHost(dep: IGlobalDependency,
  cancelToken: CancellationToken,
  scenarios: Scenario list) =
 
- let baseContext = NBomberContext.createBaseContext(sessionArgs.TestInfo, getCurrentNodeInfo(), cancelToken, _log)
+ let baseContext = NBomberContext.createBaseContext(sessionArgs.TestInfo, getCurrentNodeInfo, cancelToken, _log)
  let defaultScnContext = Scenario.ScenarioContext.create baseContext
  let enabledScenarios = scenarios |> List.filter(fun x -> x.IsEnabled)
  TestHostScenario.cleanScenarios dep baseContext defaultScnContext enabledScenarios

diff --git a/tests/NBomber.IntegrationTests/DataFeed/DataFeedTests.fs b/tests/NBomber.IntegrationTests/DataFeed/DataFeedTests.fs
@@ -28,7 +28,7 @@ let createBaseContext () =
  let nodeInfo = NodeInfo.init None
  let token = CancellationToken.None
  let dep = Dependency.createFor NodeType.SingleNode
- NBomberContext.createBaseContext(dep.TestInfo, nodeInfo, token, dep.Dep.Logger)
+ NBomberContext.createBaseContext(dep.TestInfo, (fun () -> nodeInfo), token, dep.Dep.Logger)
 
 [<Property>]
 let ``createCircular iterate over array sequentially``(length: int) =