michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes : 1 Saving results cannot be stopped, 2 Processing statistics, 3 SensusTestInfo

Browse Source
This commit is contained in:
Milan Hanajik
2022-01-04 15:30:10 +01:00
parent c8ff5f8813
commit 1133a2d5bf
8 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Sequences/MainSeq.cs
+7 -7
View File
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using log4net;
using NHibernate;
using Common;
@@ -1331,18 +1332,14 @@ namespace TBF.Rig.Sequences
}
}
}
savingAndPrintingRslts.AddOperation(checkUiOp)
.EnterState();
savingAndPrintingRslts.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
}
while (e.Contains(Event.Busy));
///
bool resultsSent = !e.Contains(Event.ErrorProcessingResults);
ProcessData.BatchRslts.Batch.RsltsSent = resultsSent;
ProcessData.BatchRslts.Batch.RsltsSent = !e.Contains(Event.ErrorProcessingResults);
///
/// Save results to 'Results' MySQL database
@@ -1352,7 +1349,8 @@ namespace TBF.Rig.Sequences
///
/// Save results to 'summary results' logger
///
foreach (var tr in ProcessData.BatchRslts.Batch.TestRslts)
log.WarnFormat("Saving SummaryResults of batch {0}", ProcessData.BatchRslts.Batch.BatchNr);
foreach (var tr in ProcessData.BatchRslts.Batch.TestRslts)
{
summaryResults.Info(TestResult2CsvLine(tr));
}
@@ -1381,6 +1379,8 @@ namespace TBF.Rig.Sequences
///
if (ProcessData.StatisticsMonitoringComp is IStatisticsMonitoring)
{
Bridge.OnActivity(this, Strings.Processing_statistics);
State.Create("MainSeq : Processing statistics")
.AddOperation((ProcessData.StatisticsMonitoringComp as IStatisticsMonitoring).ProcessStatisticsOp(ProcessData.BatchRslts.Batch.BatchNr))
.AddOperation(checkUiOp)
TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs
+2 -2
View File
@@ -27,12 +27,12 @@ namespace TBF.Rig.Various.StatisticsMonitoring
: base(cfg)
{
statisticsCfg = cfg as StatisticsCfg;
log.Warn(this.ToString());
}
public override void Initialize()
{
ApplyConfig();
log.FatalFormat("{0} initialized: {1}", Name, this);
}
void ApplyConfig()
@@ -130,7 +130,7 @@ namespace TBF.Rig.Various.StatisticsMonitoring
{
usagesMin = 0;
IList<Results.Entities.Batch> batches = session.QueryOver<Results.Entities.Batch>()
.Where(x => x.Id == batchNr)
.Where(x => x.BatchNr == batchNr)
.List();
batchNr--;
if (batches.Count != 1 || batches[0].TestRslts.Count < 1 || batches[0].TestRslts[0].MethodClass != "TestMethods.iPerlCommunication")