status-im
/
cs-codex-dist-tests
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds container alias to log. Useful for transient nodes

This commit is contained in:
benbierens 2023-06-30 08:39:18 +02:00
parent 66e6cdc027
commit e7e464b4fa
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ContinuousTests/NodeRunner.cs
View File

@ -28,17 +28,17 @@ namespace ContinuousTests
this.ethereumAccountIndex = ethereumAccountIndex; this.ethereumAccountIndex = ethereumAccountIndex;
} }
public void RunNode(Action<CodexAccess, MarketplaceAccess> operation) public void RunNode(Action<CodexAccess, MarketplaceAccess, TestLifecycle> operation)
{ {
RunNode(nodes.ToList().PickOneRandom(), operation, 0.TestTokens()); RunNode(nodes.ToList().PickOneRandom(), operation, 0.TestTokens());
} }
public void RunNode(CodexAccess bootstrapNode, Action<CodexAccess, MarketplaceAccess> operation) public void RunNode(CodexAccess bootstrapNode, Action<CodexAccess, MarketplaceAccess, TestLifecycle> operation)
{ {
RunNode(bootstrapNode, operation, 0.TestTokens()); RunNode(bootstrapNode, operation, 0.TestTokens());
} }
public void RunNode(CodexAccess bootstrapNode, Action<CodexAccess, MarketplaceAccess> operation, TestToken mintTestTokens) public void RunNode(CodexAccess bootstrapNode, Action<CodexAccess, MarketplaceAccess, TestLifecycle> operation, TestToken mintTestTokens)
{ {
var (workflowCreator, lifecycle) = CreateFacilities(); var (workflowCreator, lifecycle) = CreateFacilities();
var flow = workflowCreator.CreateWorkflow(); var flow = workflowCreator.CreateWorkflow();
@ -49,6 +49,7 @@ namespace ContinuousTests
Assert.That(!string.IsNullOrEmpty(debugInfo.spr)); Assert.That(!string.IsNullOrEmpty(debugInfo.spr));
var startupConfig = new StartupConfig(); var startupConfig = new StartupConfig();
startupConfig.NameOverride = "TransientNode";
var codexStartConfig = new CodexStartupConfig(CodexLogLevel.Trace); var codexStartConfig = new CodexStartupConfig(CodexLogLevel.Trace);
codexStartConfig.MarketplaceConfig = new MarketplaceInitialConfig(0.Eth(), 0.TestTokens(), false); codexStartConfig.MarketplaceConfig = new MarketplaceInitialConfig(0.Eth(), 0.TestTokens(), false);
codexStartConfig.MarketplaceConfig.AccountIndexOverride = ethereumAccountIndex; codexStartConfig.MarketplaceConfig.AccountIndexOverride = ethereumAccountIndex;
@ -74,7 +75,7 @@ namespace ContinuousTests
try try
{ {
operation(codexAccess, marketAccess); operation(codexAccess, marketAccess, lifecycle);
} }
catch catch
{ {

2
ContinuousTests/SingleTestRun.cs
View File

@ -168,7 +168,7 @@ namespace ContinuousTests
{ {
Log(msg); Log(msg);
var containerNames = $"({string.Join(",", nodes.Select(n => n.Container.Name))})"; var containerNames = $"({string.Join(",", nodes.Select(n => n.Container.Name))})";
overviewLog.Log( testName + ": " + msg); overviewLog.Log($"{containerNames} {testName}: {msg}");
} }
private CodexAccess[] CreateRandomNodes(int number) private CodexAccess[] CreateRandomNodes(int number)

2
DistTestCore/Codex/CodexAccess.cs
View File

@ -80,7 +80,7 @@ namespace DistTestCore.Codex
private Http Http(TimeSpan? timeoutOverride = null) private Http Http(TimeSpan? timeoutOverride = null)
{ {
return new Http(log, timeSet, Address, baseUrl: "/api/codex/v1", timeoutOverride); return new Http(log, timeSet, Address, baseUrl: "/api/codex/v1", Container.Name, timeoutOverride);
} }
} }
} }

13
DistTestCore/Http.cs
View File

@ -12,14 +12,16 @@ namespace DistTestCore
private readonly ITimeSet timeSet; private readonly ITimeSet timeSet;
private readonly Address address; private readonly Address address;
private readonly string baseUrl; private readonly string baseUrl;
private readonly string? logAlias;
private readonly TimeSpan? timeoutOverride; private readonly TimeSpan? timeoutOverride;
public Http(BaseLog log, ITimeSet timeSet, Address address, string baseUrl, TimeSpan? timeoutOverride = null) public Http(BaseLog log, ITimeSet timeSet, Address address, string baseUrl, string? logAlias = null, TimeSpan? timeoutOverride = null)
{ {
this.log = log; this.log = log;
this.timeSet = timeSet; this.timeSet = timeSet;
this.address = address; this.address = address;
this.baseUrl = baseUrl; this.baseUrl = baseUrl;
this.logAlias = logAlias;
this.timeoutOverride = timeoutOverride; this.timeoutOverride = timeoutOverride;
if (!this.baseUrl.StartsWith("/")) this.baseUrl = "/" + this.baseUrl; if (!this.baseUrl.StartsWith("/")) this.baseUrl = "/" + this.baseUrl;
if (!this.baseUrl.EndsWith("/")) this.baseUrl += "/"; if (!this.baseUrl.EndsWith("/")) this.baseUrl += "/";
@ -113,7 +115,14 @@ namespace DistTestCore
private void Log(string url, string message) private void Log(string url, string message)
{ {
log.Debug($"({url}) = '{message}'", 3); if (logAlias != null)
{
log.Debug($"({logAlias})({url}) = '{message}'", 3);
}
else
{
log.Debug($"({url}) = '{message}'", 3);
}
} }
private T Retry<T>(Func<T> operation, string description) private T Retry<T>(Func<T> operation, string description)