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

Correct cancelling behavior

This commit is contained in:
benbierens 2023-06-29 10:23:04 +02:00
parent b42570be14
commit dc38797ee7
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
4 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
CodexNetDeployer/CodexNodeStarter.cs
View File

@ -40,32 +40,41 @@ namespace CodexNetDeployer
var tokenAddress = gethResult.MarketplaceNetwork.Marketplace.TokenAddress; var tokenAddress = gethResult.MarketplaceNetwork.Marketplace.TokenAddress;
var marketAccess = new MarketplaceAccess(lifecycle, gethResult.MarketplaceNetwork, account, codexAccess); var marketAccess = new MarketplaceAccess(lifecycle, gethResult.MarketplaceNetwork, account, codexAccess);
var debugInfo = codexAccess.Node.GetDebugInfo(); try
if (!string.IsNullOrWhiteSpace(debugInfo.spr))
{ {
Console.Write("Online\t"); var debugInfo = codexAccess.Node.GetDebugInfo();
if (!string.IsNullOrWhiteSpace(debugInfo.spr))
var interaction = gethResult.MarketplaceNetwork.Bootstrap.StartInteraction(lifecycle);
interaction.MintTestTokens(new[] { account.Account }, config.InitialTestTokens, tokenAddress);
Console.Write("Tokens minted\t");
var response = marketAccess.MakeStorageAvailable(
totalSpace: (config.StorageQuota!.Value - 1).MB(),
minPriceForTotalSpace: config.MinPrice.TestTokens(),
maxCollateral: config.MaxCollateral.TestTokens(),
maxDuration: TimeSpan.FromSeconds(config.MaxDuration));
if (!string.IsNullOrEmpty(response))
{ {
Console.Write("Storage available\tOK" + Environment.NewLine); Console.Write("Online\t");
if (string.IsNullOrEmpty(bootstrapSpr)) bootstrapSpr = debugInfo.spr; var interaction = gethResult.MarketplaceNetwork.Bootstrap.StartInteraction(lifecycle);
validatorsLeft--; interaction.MintTestTokens(new[] { account.Account }, config.InitialTestTokens, tokenAddress);
return container; Console.Write("Tokens minted\t");
var response = marketAccess.MakeStorageAvailable(
totalSpace: (config.StorageQuota!.Value - 1).MB(),
minPriceForTotalSpace: config.MinPrice.TestTokens(),
maxCollateral: config.MaxCollateral.TestTokens(),
maxDuration: TimeSpan.FromSeconds(config.MaxDuration));
if (!string.IsNullOrEmpty(response))
{
Console.Write("Storage available\tOK" + Environment.NewLine);
if (string.IsNullOrEmpty(bootstrapSpr)) bootstrapSpr = debugInfo.spr;
validatorsLeft--;
return container;
}
} }
} }
catch (Exception ex)
{
Console.WriteLine("Exception:" + ex.ToString());
}
Console.Write("Unknown failure. Downloading container log." + Environment.NewLine);
lifecycle.DownloadLog(container);
Console.Write("Unknown failure." + Environment.NewLine);
return null; return null;
} }

2
ContinuousTests/ContinuousTest.cs
View File

@ -44,7 +44,7 @@ namespace ContinuousTests
public IFileManager FileManager { get; private set; } = null!; public IFileManager FileManager { get; private set; } = null!;
public Configuration Configuration { get; private set; } = null!; public Configuration Configuration { get; private set; } = null!;
public virtual ITimeSet TimeSet { get { return new DefaultTimeSet(); } } public virtual ITimeSet TimeSet { get { return new DefaultTimeSet(); } }
public CancellationToken CancelToken { get; private set; } = null; public CancellationToken CancelToken { get; private set; } = new CancellationToken();
public NodeRunner NodeRunner { get; private set; } = null!; public NodeRunner NodeRunner { get; private set; } = null!;
public abstract int RequiredNumberOfNodes { get; } public abstract int RequiredNumberOfNodes { get; }

5
ContinuousTests/ContinuousTestRunner.cs
View File

@ -34,17 +34,18 @@ namespace ContinuousTests
foreach (var testLoop in testLoops) foreach (var testLoop in testLoops)
{ {
cancelToken.ThrowIfCancellationRequested(); if (cancelToken.IsCancellationRequested) break;
overviewLog.Log("Launching test-loop for " + testLoop.Name); overviewLog.Log("Launching test-loop for " + testLoop.Name);
testLoop.Begin(); testLoop.Begin();
Thread.Sleep(TimeSpan.FromSeconds(15)); Thread.Sleep(TimeSpan.FromSeconds(15));
} }
overviewLog.Log("All test-loops launched."); overviewLog.Log("Finished launching test-loops.");
cancelToken.WaitHandle.WaitOne(); cancelToken.WaitHandle.WaitOne();
overviewLog.Log("Cancelling all test-loops..."); overviewLog.Log("Cancelling all test-loops...");
taskFactory.WaitAll(); taskFactory.WaitAll();
overviewLog.Log("All tasks cancelled.");
} }
private void ClearAllCustomNamespaces(ContinuousTest[] allTests, FixtureLog log) private void ClearAllCustomNamespaces(ContinuousTest[] allTests, FixtureLog log)

12
ContinuousTests/Tests/MarketplaceTest.cs
View File

@ -65,28 +65,32 @@ namespace ContinuousTests.Tests
{ {
var lastState = ""; var lastState = "";
var waitStart = DateTime.UtcNow; var waitStart = DateTime.UtcNow;
var filesizeInMb = fileSize.SizeInBytes / 1024; var filesizeInMb = fileSize.SizeInBytes / (1024 * 1024);
var maxWaitTime = TimeSpan.FromSeconds(filesizeInMb * 10.0); var maxWaitTime = TimeSpan.FromSeconds(filesizeInMb * 10.0);
Log.Log(nameof(WaitForContractToStart) + " for " + Time.FormatDuration(maxWaitTime)); Log.Log($"{nameof(WaitForContractToStart)} for {Time.FormatDuration(maxWaitTime)}");
while (lastState != "started") while (lastState != "started")
{ {
CancelToken.ThrowIfCancellationRequested();
var purchaseStatus = codexAccess.Node.GetPurchaseStatus(purchaseId); var purchaseStatus = codexAccess.Node.GetPurchaseStatus(purchaseId);
var statusJson = JsonConvert.SerializeObject(purchaseStatus);
if (purchaseStatus != null && purchaseStatus.state != lastState) if (purchaseStatus != null && purchaseStatus.state != lastState)
{ {
lastState = purchaseStatus.state; lastState = purchaseStatus.state;
Log.Log("Purchase status: " + statusJson);
} }
Thread.Sleep(2000); Thread.Sleep(2000);
if (lastState == "errored") if (lastState == "errored")
{ {
Assert.Fail("Contract start failed: " + JsonConvert.SerializeObject(purchaseStatus)); Assert.Fail("Contract start failed: " + statusJson);
} }
if (DateTime.UtcNow - waitStart > maxWaitTime) if (DateTime.UtcNow - waitStart > maxWaitTime)
{ {
Assert.Fail($"Contract was not picked up within {maxWaitTime.TotalSeconds} seconds timeout: " + JsonConvert.SerializeObject(purchaseStatus)); Assert.Fail($"Contract was not picked up within {maxWaitTime.TotalSeconds} seconds timeout: {statusJson}");
} }
} }
Log.Log("Contract started."); Log.Log("Contract started.");