From 299a677f095d31f7038aa83951e6bbc2b9966a0b Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Tue, 14 Jan 2014 18:07:46 +0100
Subject: [PATCH] validate:tools: Add an option to run testforever

---
 validate/tools/launcher/baseclasses.py | 26 +++++++++++++++++++++++---
 validate/tools/launcher/main.py        |  6 +++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/validate/tools/launcher/baseclasses.py b/validate/tools/launcher/baseclasses.py
index 1a649c398e..d32c3fdf5a 100644
--- a/validate/tools/launcher/baseclasses.py
+++ b/validate/tools/launcher/baseclasses.py
@@ -121,6 +121,7 @@ class Test(Loggable):
 
             val = self.get_current_value()
 
+            self.debug("Got value: %s" % val)
             if val is Result.NOT_RUN:
                 # The get_current_value logic is not implemented... dumb timeout
                 if time.time() - last_change_ts > self.timeout:
@@ -297,9 +298,13 @@ class TestsManager(Loggable):
         for test in self.tests:
             if self._is_test_wanted(test):
                 self.reporter.before_test(test)
-                test.run()
+                if test.run() != Result.PASSED and\
+                        self.options.forever:
+                    return test.result
                 self.reporter.after_test()
 
+        return Result.PASSED
+
     def needs_http_server(self):
         return False
 
@@ -309,6 +314,7 @@ class _TestsLauncher(Loggable):
 
         Loggable.__init__(self)
 
+        self.options = None
         self.testers = []
         self.tests = []
         self.reporter = None
@@ -353,6 +359,7 @@ class _TestsLauncher(Loggable):
         self.reporter = reporters.XunitReporter(options)
         mkdir(options.logsdir)
 
+        self.options = options
         wanted_testers = None
         for tester in self.testers:
             if tester.name in args:
@@ -373,9 +380,22 @@ class _TestsLauncher(Loggable):
             tester.list_tests()
             self.tests.extend(tester.tests)
 
-    def run_tests(self):
+    def _run_tests(self):
         for tester in self.testers:
-            tester.run_tests()
+            res = tester.run_tests()
+            if self.options.forever and res != Result.PASSED:
+                return False
+
+        return True
+
+    def run_tests(self):
+        if self.options.forever:
+            while self._run_tests():
+                continue
+
+            return False
+        else:
+            return self._run_tests()
 
     def final_report(self):
         self.reporter.final_report()
diff --git a/validate/tools/launcher/main.py b/validate/tools/launcher/main.py
index 4078b9feda..7e2baca365 100644
--- a/validate/tools/launcher/main.py
+++ b/validate/tools/launcher/main.py
@@ -36,9 +36,9 @@ def main():
                       #action="store_true",
                       #default=False,
                       #help="Run applications into gdb")
-    #parser.add_option("-f", "--forever", dest="forever",
-                      #action="store_true", default=False,
-                      #help="Keep running tests until one fails")
+    parser.add_option("-f", "--forever", dest="forever",
+                      action="store_true", default=False,
+                      help="Keep running tests until one fails")
     #parser.add_option("-F", "--fatal-error", dest="fatal_error",
                       #action="store_true", default=False,
                       #help="Stop on first fail")