Merge branch 'master' into 'qa'

Improved logic/Disabled failures xrootd-fallback

See merge request !6

SiteTests/testjob/tests/CE-cms-xrootd-fallback

@@ -379,7 +379,7 @@ def main():
     no_trial = 0
     while ( no_trial < 3 ):
         if (opts.endtime - time.time()) < 60:
-            log.error("Timed out before reaching 3 attempts limit")
+            log.error("Timed out before reaching 3rd attempt")
             exitCode = 8015
             break
 
@@ -407,13 +407,14 @@ def main():
         if ( exitCode == 0 ):
             break
 
+        log.error("Failed cmsRun output:")
+        print stdout
+
         if (opts.endtime - time.time()) < 60:
             log.error("Not enough time left for another try")
+            exitCode = 8015
             break 
 
-        log.error("Failed cmsRun output:")
-        print stdout
-
         rndm_site = (rndm_site + 1) % len(CSWNFB_SITES)
         if ( CSWNFB_SITES[rndm_site] == siteName ):
             rndm_site = (rndm_site + 1) % len(CSWNFB_SITES)
@@ -422,7 +423,7 @@ def main():
     if exitCode:
         if exitCode == 8015:
             returnCode = NAG_WARNING
-            return print_summary("Test reached timeout before the third attempt; exit code %s" % exitCode, returnCode)
+            return print_summary("Test reached timeout ; exit code %s" % exitCode, returnCode)
         returnCode = NAG_CRITICAL
         return print_summary("Failed cmsRun; exit code %d" % exitCode, returnCode)