Skip to content

Commit ae10d23

Browse files
committed
added IBaseContext.GetNodeInfo: unit -> NodeInfo
1 parent 882a24e commit ae10d23

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

src/NBomber/Domain/Scenario.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ module ScenarioContext =
158158
let create (context: IBaseContext) = {
159159
new IScenarioContext with
160160
member _.TestInfo = context.TestInfo
161-
member _.NodeInfo = context.NodeInfo
161+
member _.NodeInfo = context.GetNodeInfo()
162162
member _.CustomSettings = ConfigurationBuilder().Build() :> IConfiguration
163163
member _.CancellationToken = context.CancellationToken
164164
member _.Logger = context.Logger

src/NBomber/DomainServices/NBomberContext.fs

+4-5
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,9 @@ let createSessionArgs (testInfo: TestInfo) (scenarios: DomainTypes.Scenario list
320320
let createScenarios (context: NBomberContext) =
321321
context.RegisteredScenarios |> Scenario.createScenarios
322322

323-
let createBaseContext (testInfo, nodeInfo, token, logger) = {
324-
new IBaseContext with
323+
let createBaseContext (testInfo, getNodeInfo: unit -> NodeInfo, token, logger) =
324+
{ new IBaseContext with
325325
member _.TestInfo = testInfo
326-
member _.NodeInfo = nodeInfo
326+
member _.GetNodeInfo() = getNodeInfo()
327327
member _.CancellationToken = token
328-
member _.Logger = logger
329-
}
328+
member _.Logger = logger }

src/NBomber/DomainServices/TestHost/TestHost.fs

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ type internal TestHost(dep: IGlobalDependency,
9393

9494
let targetScenarios = regScenarios |> TestHostScenario.getTargetScenarios sessionArgs
9595

96-
let baseContext = NBomberContext.createBaseContext(sessionArgs.TestInfo, getCurrentNodeInfo(), cancelToken, _log)
96+
let baseContext = NBomberContext.createBaseContext(sessionArgs.TestInfo, getCurrentNodeInfo, cancelToken, _log)
9797
let defaultScnContext = Scenario.ScenarioContext.create baseContext
9898

9999
do! dep.WorkerPlugins |> WorkerPlugins.init dep baseContext
@@ -136,7 +136,7 @@ type internal TestHost(dep: IGlobalDependency,
136136
cancelToken: CancellationToken,
137137
scenarios: Scenario list) =
138138

139-
let baseContext = NBomberContext.createBaseContext(sessionArgs.TestInfo, getCurrentNodeInfo(), cancelToken, _log)
139+
let baseContext = NBomberContext.createBaseContext(sessionArgs.TestInfo, getCurrentNodeInfo, cancelToken, _log)
140140
let defaultScnContext = Scenario.ScenarioContext.create baseContext
141141
let enabledScenarios = scenarios |> List.filter(fun x -> x.IsEnabled)
142142
TestHostScenario.cleanScenarios dep baseContext defaultScnContext enabledScenarios

src/NBomber/NBomber.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="2.13.0" />
8383
<PackageReference Include="FuncyDown" Version="1.3.0" />
8484
<PackageReference Include="HdrHistogram" Version="2.5.0" />
85-
<PackageReference Include="NBomber.Contracts" Version="[3.0.0-rc]" />
85+
<PackageReference Include="NBomber.Contracts" Version="[3.0.0-rc2]" />
8686
<PackageReference Include="Serilog" Version="2.10.0" />
8787
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
8888
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />

tests/NBomber.IntegrationTests/DataFeed/DataFeedTests.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let createBaseContext () =
2828
let nodeInfo = NodeInfo.init None
2929
let token = CancellationToken.None
3030
let dep = Dependency.createFor NodeType.SingleNode
31-
NBomberContext.createBaseContext(dep.TestInfo, nodeInfo, token, dep.Dep.Logger)
31+
NBomberContext.createBaseContext(dep.TestInfo, (fun () -> nodeInfo), token, dep.Dep.Logger)
3232

3333
[<Property>]
3434
let ``createCircular iterate over array sequentially``(length: int) =

0 commit comments

Comments
 (0)