Validation: minor tweaks

Author: PMeira

tests/compare_outputs.py

@@ -21,6 +21,7 @@ class MISSING:
 VERBOSE = False
 ENABLE_XML = False
 ENABLE_CSV = True
+ENABLE_JSON = True
 
 KNOWN_COM_DIFF = set([
     # On official COM, uninitialized values for CalcCurrent, AllocFactors
@@ -343,15 +344,20 @@ def compare_all(self):
                 try:
                     fB = zipB.open(fn, 'r')
                     fA = zipA.open(fn, 'r')
-                    print(fn)
                 except KeyError:
-                    print('MISSING:', fn)
+                    if not fn.endswith('GISCoords.dss'):
+                        print('MISSING:', fn)
+
                     continue
                 except BadZipFile:
                     print('BAD:', fn)
                     continue
 
-                if fn.endswith('.json'):
+                if ENABLE_JSON and fn.endswith('.json'):
+                    if not ENABLE_JSON:
+                        continue
+
+                    print(fn)
                     dataA = json.load(fA)
                     dataB = json.load(fB)
 
@@ -367,7 +373,12 @@ def compare_all(self):
                         print("COMPARE ERROR:", fn)
                         raise
 
-                elif ENABLE_XML and fn.endswith('.xml'):
+                elif fn.endswith('.xml'):
+                    if not ENABLE_XML:
+                        continue
+
+                    print(fn)
+
                     # Comparing the XMLs is tricky, but this initial implementation 
                     # can still be useful. For DSS C-API 0.13.0, we manually checked.
                     # One issue is that the maintenance of ExportCIMXML.pas is not
@@ -391,7 +402,12 @@ def compare_all(self):
 
                             print(type(d))
 
-                elif ENABLE_CSV and fn.endswith('.csv'):
+                elif fn.endswith('.csv'):
+                    if not ENABLE_CSV:
+                        continue
+
+                    print(fn)
+
                     # The CSVs from OpenDSS can havbe some weird header, and we need to compare 
                     # the lowercase data to simplify things.
                     textA = fA.read().decode().lower()
@@ -400,6 +416,9 @@ def compare_all(self):
                         df_a = pd.read_csv(sfA)
                         df_b = pd.read_csv(sfB)
 
+                        df_a.columns = [x.strip() for x in df_a.columns]
+                        df_b.columns = [x.strip() for x in df_b.columns]
+
                     try:
                         pd.testing.assert_frame_equal(df_a, df_b, atol=tol, rtol=tol)
                     except:

tests/save_outputs.py

@@ -366,7 +366,8 @@ def get_archive_fn(live_fn):
 
     t0_global = perf_counter()
     total_runtime = 0.0
-    with ZipFile(os.path.join(original_working_dir, f'results{suffix}.zip'), mode='a', compression=ZIP_DEFLATED) as zip_out:
+    zip_fn = f'results{suffix}.zip'
+    with ZipFile(os.path.join(original_working_dir, zip_fn), mode='a', compression=ZIP_DEFLATED) as zip_out:
         for fn in test_filenames + cimxml_test_filenames:
             org_fn = fn
             fixed_fn = fn if not fn.startswith('L!') else fn[2:]
@@ -431,4 +432,5 @@ def get_archive_fn(live_fn):
 
     print(perf_counter() - t0_global, 'seconds')
     print(total_runtime, 'seconds (runtime only)')
+    print(zip_fn)