Merge pull request #1610 from ESMCI/fischer/testreporter_fix

Update testreporter and change hobart queue to medium.
Update testreporter.py to handle compare failures that were being missed.
Remove tagname from the testdb comments that were added to the GENERATE and
BASLINE lines in TestStatus.
Change the default queue on hobart from short to medium to handle tests that were
running a little long.

Test suite: scripts_regression_tests.pr, populated testdb for alpha06m
Test baseline:
Test namelist changes:
Test status: bit for bit,

Fixes #1555

User interface changes?:

Code review:jedwards

config/cesm/machines/config_batch.xml

@@ -232,7 +232,8 @@
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
     </directives>
     <queues>
-      <queue walltimemax="02:00:00" jobmin="1" jobmax="192" default="true">short</queue>
+      <queue walltimemax="02:00:00" jobmin="1" jobmax="192" >short</queue>
+      <queue walltimemax="06:00:00" jobmin="1" jobmax="192" default="true">medium</queue>
       <queue walltimemax="40:00:00" jobmin="1" jobmax="144" >long</queue>
     </queues>
   </batch_system>

scripts/Tools/testreporter.py

@@ -181,13 +181,31 @@ def get_testreporter_xml(testroot, testid, tagname, testtype):
                 if line[0:4] == "FAIL":
                     test_status['COMMENT']+="Hybrid fail! "
                     break
+            if "COMPARE_base_multiinst" in line:
+                test_status['STATUS']=line[0:4]
+                if line[0:4] == "FAIL":
+                    test_status['COMMENT']+="Multi instance fail! "
+                    break
+            if "COMPARE_base_test" in line:
+                test_status['STATUS']=line[0:4]
+                if line[0:4] == "FAIL":
+                    test_status['COMMENT']+="Base test fail! "
+                    break
+            if "COMPARE_base_single_thread" in line:
+                test_status['STATUS']=line[0:4]
+                if line[0:4] == "FAIL":
+                    test_status['COMMENT']+="Thread test fail! "
+                    break
 
             #
             #  Do not include time comments.  Just a preference to have cleaner comments in the test database
             #
             try:
-                if 'time=' not in line:
-                    test_status['COMMENT']+=line.split(' ',3)[3]+' '
+                if 'time=' not in line and 'GENERATE' not in line:
+                    if 'BASELINE' not in line:
+                        test_status['COMMENT']+=line.split(' ',3)[3]+' '
+                    else:
+                        test_status['COMMENT']+=line.split(' ',4)[4]+' '
             except:
                 pass