Changeset 24219

Timestamp:

10/14/19 15:02:35 (5 years ago)

Author:

jdquinn

Message:

BUG: Fixes to Python test driver

Location:

issm/trunk-jpl

Files:

• jenkins/jenkins.sh (modified) (2 diffs)
• test/NightlyRun/runme.py (modified) (2 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -520 +520 @@
 
 # Check that Python did not exit in error
-pythonExitedInError=`grep "Traceback" python_log.log | wc -l`
+pythonExitedInError=`grep -E "Traceback|bad interpreter" python_log.log | wc -l`
 
 if [ $pythonExitedInError -ne 0 ]
@@ -532 +532 @@
 
         exit 1
-else
-        echo "PYTHONEXITEDCORRECTLY"
-fi
+fi
+
+# Python tests must have run and exited successfully (unless we have missed something)
+echo "PYTHONEXITEDCORRECTLY"
 
 if [ $EXAMPLES_TEST -eq 1 ];

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

@@ -1 @@
-#! / usr / bin / env python
+#!/usr/bin/env python
 import os
 import argparse
@@ -245 +245 @@
 
         parser = argparse.ArgumentParser(description='RUNME - test deck for ISSM nightly runs')
-        parser.add_argument(' -i', '--id', nargs=' * ', type=int, help='followed by the list of ids requested', default=[])
-        parser.add_argument(' -in', '--include_name', nargs=' * ', type=str, help='followed by the list of test names requested', default=[])
-        parser.add_argument(' -e', '--exclude', nargs=' + ', type=int, help='ids to be excluded from the test', default=[])
-        parser.add_argument(' -en', '--exclude_name', nargs=' + ', type=str, help='test names to be excluded from the test', default=[])
-        parser.add_argument(' -b', '--benchmark', help='nightly/ismip/eismint/thermal/mesh/...', default='nightly')
-        parser.add_argument(' -p', '--procedure', help='check/update', default='check')
-        parser.add_argument(' -o', '--output', help='nightly/daily/none', default='none')
-        parser.add_argument(' -r', '--rank', type=int, help='rank', default=1)
-        parser.add_argument(' -n', '--numprocs', type=int, help='numprocs', default=1)
+        parser.add_argument('-i', '--id', nargs='*', type=int, help='followed by the list of ids requested', default=[])
+        parser.add_argument('-in', '--include_name', nargs='*', type=str, help='followed by the list of test names requested', default=[])
+        parser.add_argument('-e', '--exclude', nargs='+', type=int, help='ids to be excluded from the test', default=[])
+        parser.add_argument('-en', '--exclude_name', nargs='+', type=str, help='test names to be excluded from the test', default=[])
+        parser.add_argument('-b', '--benchmark', help='nightly/ismip/eismint/thermal/mesh/...', default='nightly')
+        parser.add_argument('-p', '--procedure', help='check/update', default='check')
+        parser.add_argument('-o', '--output', help='nightly/daily/none', default='none')
+        parser.add_argument('-r', '--rank', type=int, help='rank', default=1)
+        parser.add_argument('-n', '--numprocs', type=int, help='numprocs', default=1)
         args = parser.parse_args()