codex-storage
/
cs-codex-dist-tests
mirror of https://github.com/codex-storage/cs-codex-dist-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevents starting a test-run when one is already started.

This commit is contained in:
benbierens 2023-06-29 13:39:05 +02:00
parent 6a5cde2b91
commit caf5de678a
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ContinuousTests/ContinuousTestRunner.cs
View File

@ -38,7 +38,7 @@ namespace ContinuousTests
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(5));
} }
overviewLog.Log("Finished launching test-loops."); overviewLog.Log("Finished launching test-loops.");

5
ContinuousTests/SingleTestRun.cs
View File

@ -31,14 +31,14 @@ namespace ContinuousTests
this.handle = handle; this.handle = handle;
this.cancelToken = cancelToken; this.cancelToken = cancelToken;
testName = handle.Test.GetType().Name; testName = handle.Test.GetType().Name;
fixtureLog = new FixtureLog(new LogConfig(config.LogPath, false), testName); fixtureLog = new FixtureLog(new LogConfig(config.LogPath, true), testName);
nodes = CreateRandomNodes(handle.Test.RequiredNumberOfNodes); nodes = CreateRandomNodes(handle.Test.RequiredNumberOfNodes);
dataFolder = config.DataPath + "-" + Guid.NewGuid(); dataFolder = config.DataPath + "-" + Guid.NewGuid();
fileManager = new FileManager(fixtureLog, CreateFileManagerConfiguration()); fileManager = new FileManager(fixtureLog, CreateFileManagerConfiguration());
} }
public void Run() public void Run(EventWaitHandle runFinishedHandle)
{ {
taskFactory.Run(() => taskFactory.Run(() =>
{ {
@ -47,6 +47,7 @@ namespace ContinuousTests
RunTest(); RunTest();
fileManager.DeleteAllTestFiles(); fileManager.DeleteAllTestFiles();
Directory.Delete(dataFolder, true); Directory.Delete(dataFolder, true);
runFinishedHandle.Set();
} }
catch (Exception ex) catch (Exception ex)
{ {

8
ContinuousTests/TestLoop.cs
View File

@ -10,6 +10,7 @@ namespace ContinuousTests
private readonly Type testType; private readonly Type testType;
private readonly TimeSpan runsEvery; private readonly TimeSpan runsEvery;
private readonly CancellationToken cancelToken; private readonly CancellationToken cancelToken;
private readonly EventWaitHandle runFinishedHandle = new EventWaitHandle(true, EventResetMode.ManualReset);
public TestLoop(TaskFactory taskFactory, Configuration config, BaseLog overviewLog, Type testType, TimeSpan runsEvery, CancellationToken cancelToken) public TestLoop(TaskFactory taskFactory, Configuration config, BaseLog overviewLog, Type testType, TimeSpan runsEvery, CancellationToken cancelToken)
{ {
@ -32,7 +33,10 @@ namespace ContinuousTests
{ {
while (true) while (true)
{ {
WaitHandle.WaitAny(new[] { runFinishedHandle, cancelToken.WaitHandle });
cancelToken.ThrowIfCancellationRequested(); cancelToken.ThrowIfCancellationRequested();
StartTest(); StartTest();
cancelToken.WaitHandle.WaitOne(runsEvery); cancelToken.WaitHandle.WaitOne(runsEvery);
@ -55,7 +59,9 @@ namespace ContinuousTests
var test = (ContinuousTest)Activator.CreateInstance(testType)!; var test = (ContinuousTest)Activator.CreateInstance(testType)!;
var handle = new TestHandle(test); var handle = new TestHandle(test);
var run = new SingleTestRun(taskFactory, config, overviewLog, handle, cancelToken); var run = new SingleTestRun(taskFactory, config, overviewLog, handle, cancelToken);
run.Run();
runFinishedHandle.Reset();
run.Run(runFinishedHandle);
} }
} }
} }