Merge "Tolerate flush/finish test assumption failures." am: b821430a47 am: 686f9a59dc

am: 22fa1270d3

Change-Id: Id10dda77bcdc68801979ec69594035ae43dbd24e

diff --cc framework/common/tcuApp.cpp
Simple merge

diff --cc framework/common/tcuApp.hpp
index 7ee007d,5c25fe1..0eae781
--- 1/framework/common/tcuApp.hpp
--- 2/framework/common/tcuApp.hpp
+++ b/framework/common/tcuApp.hpp
@@@ -41,8 -41,13 +41,14 @@@ class TestSessionExecutor
  class CommandLine;
  class TestLog;
  class TestPackageRoot;
 +class TestRunStatus;
  
+ enum
+ {
+       WATCHDOG_TOTAL_TIME_LIMIT_SECS          = 300,
+       WATCHDOG_INTERVAL_TIME_LIMIT_SECS       = 30
+ };
+ 
  /*--------------------------------------------------------------------*//*!
   * \brief Test application
   *