Use baseText= in TestText or switch to TestValueXX for short cases

src/test/tests/databases/export_db.py

@@ -232,7 +232,7 @@ def test1():
             for fn in files:
                 if formats[f][0] in fn:
                     s = fn + "\n"
-            TestText("files", s)
+            TestText("files", s) # MCM (12Jan21)...noticed this never executes in testing
         t = CreateAnnotationObject("Text2D")
         t.text = f
         t.position = (0.01, 0.91)
@@ -325,15 +325,15 @@ def test2(writeGroupSize):
                     OpenDatabase(datafile)
                     AddPlot(formats[f][3], formats[f][4])
                     opendbs = opendbs + [datafile]
-                    filelist = filelist + datafile + "\n"
+                    filelist = filelist + datafile + ", "
         else:
             if OpenDatabase(formats[f][1]):
                 md = GetMetaData(formats[f][1])
                 AddPlot(formats[f][3], formats[f][4])
                 opendbs = opendbs + [formats[f][1]]
-                filelist = filelist + formats[f][1] + "\n"
+                filelist = filelist + formats[f][1] + ", "
             else:
-                filelist = "ERROR: " + "\n".join(os.listdir("."))
+                filelist = "ERROR: " + ", ".join(os.listdir("."))
         DrawPlots()
         t = CreateAnnotationObject("Text2D")
         t.text = f
@@ -342,7 +342,7 @@ def test2(writeGroupSize):
         SetView3D(v)
         SetAnnotationAttributes(a)
         Test(formats[f][2])
-        TestText(formats[f][2] + "fn", filelist)
+        TestText(formats[f][2] + "fn", filelist, baseText=baseVals[formats[f][2] + "fn"])
 
         # Clean up window 2
         DeleteAllPlots()
@@ -536,9 +536,24 @@ def test_vtk_tetrahedralize():
         DrawPlots()
         Query("NumZones")
         nzNew = int(GetQueryOutputValue())
-        TestText("export_db_vtk_tets_%s"%db_noext, "Ratio of exported zone count to original is %d"%(nzNew/nzOrig))
+        TestValueEQ("export_db_vtk_tets_zone_count_ratio_%s"%db_noext, nzNew/nzOrig,
+            baseVals["export_db_vtk_tets_zone_count_ratio_%s"%db_noext])
         DeleteAllPlots()
 
+baseVals = {
+    "export_db_2_01fn": "wg_PLY.1.ply, wg_PLY.2.ply",
+    "export_db_2_02fn": "wg_RAW.1.raw, wg_RAW.2.raw",
+    "export_db_2_03fn": "wg_STL.1.stl, wg_STL.2.stl",
+    "export_db_2_04fn": "wg_Silo.silo",
+    "export_db_2_05fn": "wg_Tecplot.1.tec, wg_Tecplot.2.tec",
+    "export_db_2_06fn": "wg_VTK.visit",
+    "export_db_2_07fn": "wg_OBJ.1.obj, wg_OBJ.2.obj",
+    "export_db_2_08fn": "wg_XYZ.1.xyz, wg_XYZ.2.xyz",
+    "export_db_2_09fn": "wg_Xmdv.visit",
+    "export_db_vtk_tets_zone_count_ratio_specmix_ucd": 2,
+    "export_db_vtk_tets_zone_count_ratio_ucd3d": 6
+}
+
 def main():
     test0()
     test1()

src/test/tests/queries/queriesOverTime.py

@@ -676,7 +676,7 @@ def TestPickRangeTimeQuery():
     s = str(output_dict)
 
     Test("TimePickRange_00")
-    TestText("TimePickRangeDict_00",s)
+    TestText("TimePickRangeDict_00",s,baseText="None")
     ClearPickPoints()
 
     #

src/test/tests/rendering/saveformats.py

@@ -145,14 +145,10 @@ def TestSaveFormat(fmt):
         SaveWindow()
     except:
         if TestEnv.params["scalable"]:
-            if GetLastError() == "You cannot save non-image formats (e.g. ultra, curve, stl, etc.)" \
-                                 " from a window that is currently in scalable rendering mode. You" \
-                                 " may force scalable rendering to Never but if the resulting data" \
-                                 " is too big for the viewer to handle, it will likely crash" \
-                                 " VisIt. For 3D formats, try an export database operation instead." :
-                TestText("saveformat_%s%s"%(mode,ext), "Passed\n")
+            if GetLastError().startswith("You cannot save non-image formats"):
+                Failed("saveformat_%s%s"%(mode,ext))
                 return
-        TestText("saveformat_%s%s"%(mode,ext), result)
+        TestText("saveformat_%s%s"%(mode,ext), result, baseText="Passed")
         return
 
     # depending on the type of format this is, try to
@@ -162,13 +158,13 @@ def TestSaveFormat(fmt):
     if isC:
         if FileExists(swatmp.fileName+"."+ext, 1, 0):
             if ext == "ps":
-                result = "Passed\n" # can only test existence for ps
+                result = "Passed" # can only test existence for ps
             else:
                 SetActiveWindow(2)
                 if OpenDatabase(swatmp.fileName+"."+ext):
                     AddPlot("Curve","curve")
                     if DrawPlots():
-                        result = "Passed\n"
+                        result = "Passed"
                     DeleteAllPlots()
                     CloseDatabase(swatmp.fileName+"."+ext)
     elif isI:
@@ -186,7 +182,7 @@ def TestSaveFormat(fmt):
             if OpenDatabase(tiffFileName):
                 AddPlot("Pseudocolor","red")
                 if DrawPlots():
-                    result = "Passed\n"
+                    result = "Passed"
                 DeleteAllPlots()
                 CloseDatabase(tiffFileName)
     elif isG:
@@ -201,13 +197,12 @@ def TestSaveFormat(fmt):
             if OpenDatabase(swatmp.fileName+"."+ext):
                 AddPlot("Mesh",meshName)
                 if DrawPlots():
-                    result = "Passed\n"
+                    result = "Passed"
                 DeleteAllPlots()
                 CloseDatabase(swatmp.fileName+"."+ext)
-    TestText("saveformat_%s%s"%(mode,ext), result)
+    TestText("saveformat_%s%s"%(mode,ext), result, baseText="Passed")
     SetActiveWindow(1)
 
-
 TestSection("Curve Formats")
 OpenDatabase(data_path("curve_test_data","c062.curve"))
 

src/test/visit_test_main.py

@@ -2000,6 +2000,17 @@ def TestValueIN(case_name, bucket, expected, rndprec=5, eqoper=operator.eq):
         "%s .in. %s (prec=%d)" % (str(expected),str(bucket),rndprec),skip)
     return False
 
+#
+# Useful for cases where majority of logic for determining a passed or failed test
+# exists primarily as the python code itself being executed. A good example is the
+# saveformats.py test.
+#
+def Failed(case_name):
+    TestValueOp(case_name, False, True)
+
+def Passed(case_name):
+    TestValueOp(case_name, True, True)
+
 # ----------------------------------------------------------------------------
 # Function: AssertTrue
 #