Extend timeout-factor correction from auto-tests to the appman itself

All hardcoded timed waits can now be prolonged by running the appman (or the
auto-tests) with $AM_TIMEOUT_FACTOR set to an integer value > 1.
This is especially useful when running under valgrind.

Change-Id: I96094281e70cc681584524d8475f09a976074b8a
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/tests/packagecreator/tst_packagecreator.cpp b/tests/packagecreator/tst_packagecreator.cpp
index 07883673..d4f2695d 100644
--- a/tests/packagecreator/tst_packagecreator.cpp
+++ b/tests/packagecreator/tst_packagecreator.cpp
@@ -37,7 +37,6 @@
 
 QT_USE_NAMESPACE_AM
 
-static int timeoutFactor = 1; // useful to increase timeouts when running in valgrind
 static int processTimeout = 3000;
 
 class tst_PackageCreator : public QObject
@@ -68,9 +67,7 @@ tst_PackageCreator::tst_PackageCreator()
 
 void tst_PackageCreator::initTestCase()
 {
-    timeoutFactor = qMax(1, qEnvironmentVariableIntValue("TIMEOUT_FACTOR"));
-    processTimeout *= timeoutFactor;
-    qInfo() << "Timeouts are multiplied by" << timeoutFactor << "(changed by (un)setting $TIMEOUT_FACTOR)";
+    processTimeout *= timeoutFactor();
 
     // check if tar command is available at all
     QProcess tar;