Merge pull request #2 from sot/py3

Updates for Skare py3 and py2-3 branches

get_version_id

@@ -1,3 +1,4 @@
 #!/bin/sh
 
-ska_version
+echo `ska_version` | sed 's/-.*//'
+

get_version_id_full

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ska_version

packages/Chandra.Maneuver/post_check_logs.py

@@ -0,0 +1,5 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'],
+            allows=['test_inject_errors',
+                    'test_inject_array_errors'])

packages/Chandra.Maneuver/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/Chandra.Time/post_check_logs.py

@@ -0,0 +1,4 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'],
+            allows=['mxDateTime'])

packages/Chandra.Time/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/Chandra.cmd_states/post_check_logs.py

@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])

packages/Chandra.cmd_states/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/Ska.DBI/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/Ska.Numpy/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/Ska.Shell/post_check_logs.py

@@ -0,0 +1,4 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'],
+            allows=[r'test_[a-z]+_error'])

packages/Ska.Shell/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/Ska.engarchive/post_check_logs.py

@@ -1,3 +1,6 @@
 from testr.packages import check_files
 
-check_files('test_*.log', ['warning', 'error'])
+check_files('test_*.log', ['warning', 'error'],
+            allows=['WARNING.+because colnames',
+                    'WARNING.+made new file',
+                    'WARNING.+Unexpected null file'])

packages/Ska.engarchive/test_regress_long.sh

@@ -2,7 +2,7 @@
 
 /usr/bin/git clone ${TESTR_PACKAGES_REPO}/eng_archive
 cd eng_archive
-git checkout create-faster
+git checkout master
 cp update_archive.py add_derived.py archfiles_def.sql ../
 cd ../
 mkdir data
@@ -12,7 +12,6 @@ START="2016:100"
 STOP="2016:105"
 
 export ENG_ARCHIVE=$PWD
-export PYTHONPATH=/home/aldcroft/git/eng_archive/local/lib/python2.7/site-packages
 
 # Create full resolution data
 echo "Creating archive for normal full resolution MSIDs..."
@@ -29,10 +28,11 @@ export ENG_ARCHIVE=${PWD}:/proj/sot/ska/data/eng_archive
 # Add acispow derived parameters
 CONTENTS="$CONTENTS --content=dp_acispow"
 
-# Update stats
+# Update stats.  --max-lookback-time is about 14 years.  Do not set so large
+# that the start will be before 2000:001.
 #
 echo "Creating archive stats..."
-./update_archive.py --no-full $CONTENTS --max-lookback-time 1e20
+./update_archive.py --no-full --data-root=$PWD $CONTENTS --max-lookback-time=5000
 
 # Compare newly created values to flight
 echo "Comparing newly created values to flight"

packages/Ska.ftp/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/Ska.tdb/post_check_logs.py

@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])

packages/Ska.tdb/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/agasc/post_check_logs.py

@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])

packages/agasc/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/cxotime/post_check_logs.py

@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])

packages/cxotime/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/dea_check/post_check_logs.py

@@ -0,0 +1,4 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'],
+            allows=['99% quantile value of', 'in output at out'])

packages/dea_check/post_regress.py

@@ -0,0 +1,11 @@
+from testr.packages import make_regress_files
+
+regress_files = ['out/index.rst',
+                 'out/run.dat',
+                 'out/states.dat',
+                 'out/temperatures.dat']
+
+clean = {'out/index.rst': [(r'^Run time.*', '')],
+         'out/run.dat': [(r'#.*py run at.*', '')]}
+
+make_regress_files(regress_files, clean=clean)

packages/dea_check/test_regress.sh

@@ -0,0 +1,4 @@
+python /proj/sot/ska/share/dea/dea_check.py \
+   --outdir=out \
+   --oflsdir=/data/mpcrit1/mplogs/2013/FEB0413/oflsa \
+   --run-start=2013:031

packages/kadi/post_check_logs.py

@@ -1,3 +1,7 @@
 from testr.packages import check_files
 
-check_files('test_*.log', ['warning', 'error'])
+check_files('test_*.log', ['warning', 'error'],
+            allows=['/kadi/settings.py:\d\d: UserWarning:',
+                    'warnings.warn\(message\)',
+                    'Unable to change file mode',
+                    'Coarse OBC'])

packages/kadi/test_regress_long.sh

@@ -20,4 +20,4 @@ STOP='2015:030'
 ./update_cmds --start=$START --stop=$STOP
 
 # Write event and commands data using test database
-./write_events_cmds.py --start=$START --stop=$START --data-root=events_cmds
+./write_events_cmds.py --start=$START --stop=$STOP --data-root=events_cmds

packages/kadi/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/maude/post_check_logs.py

@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])

packages/maude/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/mica/post_check_logs.py

@@ -0,0 +1,5 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'],
+            allows=['did not parse as fits unit',
+                    'specified but multiple tables'])

packages/mica/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()

packages/pyyaks/post_check_logs.py

@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])

packages/pyyaks/test_unit.py

@@ -0,0 +1,2 @@
+import testr
+testr.testr()