Always provide try information

software/cdn-test/runTestSuite.py

@@ -125,7 +125,7 @@ def main():
                 error_count=0
             )
             finished = False
-            status_dict['stdout'] = 'Build not yet successful.'
+            status_dict['stdout'] = try_info + ' Build not yet successful.'
             print(try_info + ' %r: Found not yet finished run.' % (result_file,))
           elif "\"msg\": \"[u'Build successful, connect to:', u'" in result:
             # success
@@ -137,7 +137,7 @@ def main():
             )
             finished = True
             print(try_info + ' %r: Found finished successful run.' % (result_file,))
-            status_dict['stdout'] = 'Build successful.'
+            status_dict['stdout'] = try_info + ' Build successful.'
             break
           else:
             # unknown
@@ -148,7 +148,7 @@ def main():
                 error_count=1
             )
             status_dict['stdout'] = \
-                'Cannot find success nor failure result in the output'
+                try_info + ' Cannot find success nor failure result in the output'
             print(try_info + ' %r: Found unknown run.' % (result_file,))
             finished = False
       if finished:
@@ -156,12 +156,13 @@ def main():
       if try_num >= try_amount:
         msg = try_info + ' Time exceeded, success not found.'
         print(msg)
-        status_dict['stderr'] = msg
+        status_dict.setdefault('stdout', '')
+        status_dict['stdout'] = '\n'.join([status_dict['stdout'], msg])
         break
       try_num += 1
       sleep(10)
     if not result_found:
-      status_dict['stdout'] = 'Test timed out and no result found.'
+      status_dict['stdout'] = try_info + ' Test timed out and no result found.'
       status_dict.update(
           test_count=1,
           skip_count=0,