From baa67cfe023e1857a62734f6afb2a7f3be537636 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 6 Jun 2018 09:50:52 +0200 Subject: [PATCH] Change in MainSeq reverted so that transition sequence after test is executed on Stop. ver. 2.18.915 --- TBF/BenchControl/Sequences/MainSeq.cs | 4 ++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs index 0b66923dc..13d26539d 100644 --- a/TBF/BenchControl/Sequences/MainSeq.cs +++ b/TBF/BenchControl/Sequences/MainSeq.cs @@ -734,7 +734,7 @@ namespace TBF.BenchControl.Sequences if (currentTestFinished && !isOuterLoopMode && repetNr > test.Repeats) repetNr = 1; /// Reset repetNr } - if (currentTestFinished && testMethod.DoTransitions()) + if (testMethod.DoTransitions()) { TransitionContext endContext = currentTestFinished ? TransitionContext.AfterTest : TransitionContext.Stop; rsltTransAfter = Transition(transitionAfter, endContext); /// Transition or SetRoute - end of test @@ -916,7 +916,7 @@ namespace TBF.BenchControl.Sequences Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, testFinished ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); - if (testFinished && testMethod.DoTransitions()) + if (testMethod.DoTransitions()) { TransitionContext endContext = testFinished ? TransitionContext.AfterTest : TransitionContext.Stop; rsltTransAfter = Transition(transitionAfter, endContext); /// Transition or SetRoute - end of test diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 9cf3d5cb5..2035bb0c4 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.914.0")] -[assembly: AssemblyFileVersion("2.18.914.0")] +[assembly: AssemblyVersion("2.18.915.0")] +[assembly: AssemblyFileVersion("2.18.915.0")]