From 485fb0327f91a45e4a228d3751b1ff239cd934f6 Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Fri, 6 Jan 2017 13:59:47 -0500
Subject: [PATCH 1/9] Add / change package tests

---
 packages/Chandra.Maneuver/post_check_logs.py | 5 +++++
 packages/Chandra.Maneuver/test_unit.py       | 2 ++
 packages/Ska.DBI/test_unit.py                | 2 ++
 packages/Ska.DBI/test_unit_git.sh            | 4 ----
 packages/Ska.Numpy/test_unit.py              | 2 ++
 packages/Ska.Numpy/test_unit_git.sh          | 5 -----
 packages/Ska.Shell/post_check_logs.py        | 3 +++
 packages/Ska.Shell/test_unit.py              | 2 ++
 packages/Ska.ftp/test_unit.py                | 2 ++
 packages/Ska.ftp/test_unit_git.sh            | 4 ----
 packages/kadi/test_unit.py                   | 2 ++
 packages/kadi/test_unit_git.sh               | 5 -----
 12 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 packages/Chandra.Maneuver/post_check_logs.py
 create mode 100644 packages/Chandra.Maneuver/test_unit.py
 create mode 100644 packages/Ska.DBI/test_unit.py
 delete mode 100644 packages/Ska.DBI/test_unit_git.sh
 create mode 100644 packages/Ska.Numpy/test_unit.py
 delete mode 100644 packages/Ska.Numpy/test_unit_git.sh
 create mode 100644 packages/Ska.Shell/post_check_logs.py
 create mode 100644 packages/Ska.Shell/test_unit.py
 create mode 100644 packages/Ska.ftp/test_unit.py
 delete mode 100644 packages/Ska.ftp/test_unit_git.sh
 create mode 100644 packages/kadi/test_unit.py
 delete mode 100644 packages/kadi/test_unit_git.sh

diff --git a/packages/Chandra.Maneuver/post_check_logs.py b/packages/Chandra.Maneuver/post_check_logs.py
new file mode 100644
index 0000000..c806f4e
--- /dev/null
+++ b/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'])
diff --git a/packages/Chandra.Maneuver/test_unit.py b/packages/Chandra.Maneuver/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/Chandra.Maneuver/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/Ska.DBI/test_unit.py b/packages/Ska.DBI/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/Ska.DBI/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/Ska.DBI/test_unit_git.sh b/packages/Ska.DBI/test_unit_git.sh
deleted file mode 100644
index 08bdc48..0000000
--- a/packages/Ska.DBI/test_unit_git.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/bin/git clone ${TESTR_PACKAGES_REPO}/${TESTR_PACKAGE}
-cd ${TESTR_PACKAGE}
-git checkout master
-py.test test.py -v -s
diff --git a/packages/Ska.Numpy/test_unit.py b/packages/Ska.Numpy/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/Ska.Numpy/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/Ska.Numpy/test_unit_git.sh b/packages/Ska.Numpy/test_unit_git.sh
deleted file mode 100644
index b85ee58..0000000
--- a/packages/Ska.Numpy/test_unit_git.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-/usr/bin/git clone ${TESTR_PACKAGES_REPO}/${TESTR_PACKAGE}
-cd ${TESTR_PACKAGE}
-git checkout master
-python setup.py build_ext --inplace
-py.test test.py -v -s
diff --git a/packages/Ska.Shell/post_check_logs.py b/packages/Ska.Shell/post_check_logs.py
new file mode 100644
index 0000000..5772116
--- /dev/null
+++ b/packages/Ska.Shell/post_check_logs.py
@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])
diff --git a/packages/Ska.Shell/test_unit.py b/packages/Ska.Shell/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/Ska.Shell/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/Ska.ftp/test_unit.py b/packages/Ska.ftp/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/Ska.ftp/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/Ska.ftp/test_unit_git.sh b/packages/Ska.ftp/test_unit_git.sh
deleted file mode 100644
index 7314b28..0000000
--- a/packages/Ska.ftp/test_unit_git.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/bin/git clone ${TESTR_PACKAGES_REPO}/${TESTR_PACKAGE}
-cd ${TESTR_PACKAGE}
-git checkout master
-py.test -v -s
diff --git a/packages/kadi/test_unit.py b/packages/kadi/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/kadi/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/kadi/test_unit_git.sh b/packages/kadi/test_unit_git.sh
deleted file mode 100644
index 4e43818..0000000
--- a/packages/kadi/test_unit_git.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-VERSION=`python -c "import kadi; print(kadi.__version__)"`
-/usr/bin/git clone ${TESTR_PACKAGES_REPO}/${TESTR_PACKAGE}
-cd ${TESTR_PACKAGE}
-git checkout ${VERSION}
-py.test kadi/tests -v -s

From 0bf6dfb1fba56e066f78d16d2fb4598887cdd269 Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Fri, 6 Jan 2017 14:02:14 -0500
Subject: [PATCH 2/9] Use only major Ska version for output directory

---
 get_version_id | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/get_version_id b/get_version_id
index 401ce89..a0b089a 100755
--- a/get_version_id
+++ b/get_version_id
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-ska_version
+echo `ska_version` | sed 's/-.*//'
+

From 41a4d988d6748559e0be3e77fc42fbf2e5b40f6c Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Fri, 6 Jan 2017 15:52:13 -0500
Subject: [PATCH 3/9] Adjust Ska.Shell post_check

---
 packages/Ska.Shell/post_check_logs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/Ska.Shell/post_check_logs.py b/packages/Ska.Shell/post_check_logs.py
index 5772116..41a2bd5 100644
--- a/packages/Ska.Shell/post_check_logs.py
+++ b/packages/Ska.Shell/post_check_logs.py
@@ -1,3 +1,4 @@
 from testr.packages import check_files
 
-check_files('test_*.log', ['warning', 'error'])
+check_files('test_*.log', ['warning', 'error'],
+            allows=[r'test_[a-z]+_error'])

From 1e7e5f697ee2a3a831fa8f0d5a50931151a21426 Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Fri, 6 Jan 2017 15:52:53 -0500
Subject: [PATCH 4/9] More packages

---
 packages/Chandra.Time/post_check_logs.py       | 4 ++++
 packages/Chandra.Time/test_unit.py             | 2 ++
 packages/Chandra.cmd_states/post_check_logs.py | 3 +++
 packages/Chandra.cmd_states/test_unit.py       | 2 ++
 packages/Ska.tdb/post_check_logs.py            | 3 +++
 packages/Ska.tdb/test_unit.py                  | 2 ++
 packages/agasc/post_check_logs.py              | 3 +++
 packages/agasc/test_unit.py                    | 2 ++
 packages/cxotime/post_check_logs.py            | 3 +++
 packages/cxotime/test_unit.py                  | 2 ++
 packages/maude/post_check_logs.py              | 3 +++
 packages/maude/test_unit.py                    | 2 ++
 packages/pyyaks/post_check_logs.py             | 3 +++
 packages/pyyaks/test_unit.py                   | 2 ++
 14 files changed, 36 insertions(+)
 create mode 100644 packages/Chandra.Time/post_check_logs.py
 create mode 100644 packages/Chandra.Time/test_unit.py
 create mode 100644 packages/Chandra.cmd_states/post_check_logs.py
 create mode 100644 packages/Chandra.cmd_states/test_unit.py
 create mode 100644 packages/Ska.tdb/post_check_logs.py
 create mode 100644 packages/Ska.tdb/test_unit.py
 create mode 100644 packages/agasc/post_check_logs.py
 create mode 100644 packages/agasc/test_unit.py
 create mode 100644 packages/cxotime/post_check_logs.py
 create mode 100644 packages/cxotime/test_unit.py
 create mode 100644 packages/maude/post_check_logs.py
 create mode 100644 packages/maude/test_unit.py
 create mode 100644 packages/pyyaks/post_check_logs.py
 create mode 100644 packages/pyyaks/test_unit.py

diff --git a/packages/Chandra.Time/post_check_logs.py b/packages/Chandra.Time/post_check_logs.py
new file mode 100644
index 0000000..da15068
--- /dev/null
+++ b/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'])
diff --git a/packages/Chandra.Time/test_unit.py b/packages/Chandra.Time/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/Chandra.Time/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/Chandra.cmd_states/post_check_logs.py b/packages/Chandra.cmd_states/post_check_logs.py
new file mode 100644
index 0000000..5772116
--- /dev/null
+++ b/packages/Chandra.cmd_states/post_check_logs.py
@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])
diff --git a/packages/Chandra.cmd_states/test_unit.py b/packages/Chandra.cmd_states/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/Chandra.cmd_states/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/Ska.tdb/post_check_logs.py b/packages/Ska.tdb/post_check_logs.py
new file mode 100644
index 0000000..5772116
--- /dev/null
+++ b/packages/Ska.tdb/post_check_logs.py
@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])
diff --git a/packages/Ska.tdb/test_unit.py b/packages/Ska.tdb/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/Ska.tdb/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/agasc/post_check_logs.py b/packages/agasc/post_check_logs.py
new file mode 100644
index 0000000..5772116
--- /dev/null
+++ b/packages/agasc/post_check_logs.py
@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])
diff --git a/packages/agasc/test_unit.py b/packages/agasc/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/agasc/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/cxotime/post_check_logs.py b/packages/cxotime/post_check_logs.py
new file mode 100644
index 0000000..5772116
--- /dev/null
+++ b/packages/cxotime/post_check_logs.py
@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])
diff --git a/packages/cxotime/test_unit.py b/packages/cxotime/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/cxotime/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/maude/post_check_logs.py b/packages/maude/post_check_logs.py
new file mode 100644
index 0000000..5772116
--- /dev/null
+++ b/packages/maude/post_check_logs.py
@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])
diff --git a/packages/maude/test_unit.py b/packages/maude/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/maude/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()
diff --git a/packages/pyyaks/post_check_logs.py b/packages/pyyaks/post_check_logs.py
new file mode 100644
index 0000000..5772116
--- /dev/null
+++ b/packages/pyyaks/post_check_logs.py
@@ -0,0 +1,3 @@
+from testr.packages import check_files
+
+check_files('test_*.log', ['warning', 'error'])
diff --git a/packages/pyyaks/test_unit.py b/packages/pyyaks/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/pyyaks/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()

From 91b91947f06e68b164af23c0c36625cdc046b93f Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Fri, 6 Jan 2017 17:39:40 -0500
Subject: [PATCH 5/9] Add mica package

---
 packages/mica/post_check_logs.py | 5 +++++
 packages/mica/test_unit.py       | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 packages/mica/post_check_logs.py
 create mode 100644 packages/mica/test_unit.py

diff --git a/packages/mica/post_check_logs.py b/packages/mica/post_check_logs.py
new file mode 100644
index 0000000..fee8d7e
--- /dev/null
+++ b/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'])
diff --git a/packages/mica/test_unit.py b/packages/mica/test_unit.py
new file mode 100644
index 0000000..d72fe33
--- /dev/null
+++ b/packages/mica/test_unit.py
@@ -0,0 +1,2 @@
+import testr
+testr.testr()

From 79b9f0c9fd383e5d9e594a2f211edf8d8bdabbed Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Sun, 8 Jan 2017 10:05:21 -0500
Subject: [PATCH 6/9] Fixes for eng_archive and kadi

---
 packages/Ska.engarchive/test_regress_long.sh | 8 ++++----
 packages/kadi/post_check_logs.py             | 6 +++++-
 packages/kadi/test_regress_long.sh           | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/Ska.engarchive/test_regress_long.sh b/packages/Ska.engarchive/test_regress_long.sh
index 14b4d7e..70e4503 100644
--- a/packages/Ska.engarchive/test_regress_long.sh
+++ b/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"
diff --git a/packages/kadi/post_check_logs.py b/packages/kadi/post_check_logs.py
index 5772116..0ab8c42 100644
--- a/packages/kadi/post_check_logs.py
+++ b/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'])
diff --git a/packages/kadi/test_regress_long.sh b/packages/kadi/test_regress_long.sh
index 9e74999..b2b16f8 100644
--- a/packages/kadi/test_regress_long.sh
+++ b/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

From e85742a6960bd3334168f26ffdcafba823f08d5b Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Sun, 8 Jan 2017 11:26:30 -0500
Subject: [PATCH 7/9] Add 'allows' to Ska.engarchive post checking

---
 packages/Ska.engarchive/post_check_logs.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/Ska.engarchive/post_check_logs.py b/packages/Ska.engarchive/post_check_logs.py
index 5772116..65e0a80 100644
--- a/packages/Ska.engarchive/post_check_logs.py
+++ b/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'])

From 7e5071c0ca7eeee05360566adb5f632c77ea99a5 Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Sun, 8 Jan 2017 11:30:22 -0500
Subject: [PATCH 8/9] Add get version script that has full ID specification

---
 get_version_id_full | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 get_version_id_full

diff --git a/get_version_id_full b/get_version_id_full
new file mode 100755
index 0000000..401ce89
--- /dev/null
+++ b/get_version_id_full
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ska_version

From 0dd29197c9732ae8fd092ded48182eb06732292d Mon Sep 17 00:00:00 2001
From: Tom Aldcroft <taldcroft@gmail.com>
Date: Sun, 8 Jan 2017 11:34:24 -0500
Subject: [PATCH 9/9] Add dea_check package (cloned from dpa_check)

---
 packages/dea_check/post_check_logs.py |  4 ++++
 packages/dea_check/post_regress.py    | 11 +++++++++++
 packages/dea_check/test_regress.sh    |  4 ++++
 3 files changed, 19 insertions(+)
 create mode 100644 packages/dea_check/post_check_logs.py
 create mode 100644 packages/dea_check/post_regress.py
 create mode 100644 packages/dea_check/test_regress.sh

diff --git a/packages/dea_check/post_check_logs.py b/packages/dea_check/post_check_logs.py
new file mode 100644
index 0000000..0396126
--- /dev/null
+++ b/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'])
diff --git a/packages/dea_check/post_regress.py b/packages/dea_check/post_regress.py
new file mode 100644
index 0000000..f47bad7
--- /dev/null
+++ b/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)
diff --git a/packages/dea_check/test_regress.sh b/packages/dea_check/test_regress.sh
new file mode 100644
index 0000000..5d8db7a
--- /dev/null
+++ b/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