Changeset 27743

Timestamp:

05/11/23 21:26:36 (23 months ago)

Author:

jdquinn

Message:

BUG: Parsing tests under Python 3

File:

• issm/trunk-jpl/test/NightlyRun/runme.py (modified) (3 diffs)

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -9 +9 @@
 
 import numpy as np
+
+# Avoid the following error on Jenkins, 
+#
+#   "Unable to init server: Could not connect: Connection refused
+#
+#   (runme.py:28445): Gdk-CRITICAL **: 02:23:15.525: gdk_cursor_new_for_display: assertion 'GDK_IS_DISPLAY (display)' failed"
+#
+import matplotlib
+matplotlib.use('Agg')
 
 try:
@@ -92 +101 @@
     # Get benchmark {{{
     if benchmark not in ['all', 'nightly', 'validation', 'adolc', 'eismint', 'ismip', 'mesh', 'slc', 'thermal', 'tranforcing', 'qmu']:
-        print(("runme warning: benchmark '{}' not supported, defaulting to test 'nightly'.".format(benchmark)))
+        print(('runme warning: benchmark \'{}\' not supported, defaulting to test \'nightly\'.'.format(benchmark)))
         benchmark = 'nightly'
     # }}}
     # Get procedure {{{
     if procedure not in ['check', 'update', 'runFromNC']:
-        print(("runme warning: procedure '{}' not supported, defaulting to test 'check'.".format(procedure)))
+        print(('runme warning: procedure \'{}\' not supported, defaulting to test \'check\'.'.format(procedure)))
         procedure = 'check'
     # }}}
     # Get output {{{
     if output not in ['nightly', 'none']:
-        print(("runme warning: output '{}' not supported, defaulting to test 'none'.".format(output)))
+        print(('runme warning: output \'{}\' not supported, defaulting to test \'none\'.'.format(output)))
         output = 'none'
     # }}}
@@ -114 +123 @@
     i1, i2 = parallelrange(rank, numprocs, len(list_ids))  # Get tests for this CPU only
     list_ids = list_ids[i1:i2 + 1]
-    if len(id) > 0 and id is not None:
+    if len(id[0]) > 0 or len(id[1]) > 0:
         test_ids = set(GetIds(id)).intersection(set(list_ids))
         benchmark = None