From 05704c2b7e66cffa8f5730c005fcb913a69e421d Mon Sep 17 00:00:00 2001
From: sienkiew <sienkiew@d34015c8-bcbb-4646-8ac8-8ba5febf221d>
Date: Mon, 20 Feb 2012 22:50:08 +0000
Subject: reorg of tests

git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@552 d34015c8-bcbb-4646-8ac8-8ba5febf221d
---
 sm/pyetc.sm       |  4 ++++
 sm/test_common.sm |  6 ++++++
 sm/test_dev.sm    | 10 +++++-----
 sm/test_x.sm      |  8 ++++----
 4 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'sm')

diff --git a/sm/pyetc.sm b/sm/pyetc.sm
index d1b4419..0407f21 100644
--- a/sm/pyetc.sm
+++ b/sm/pyetc.sm
@@ -18,3 +18,7 @@ TABLE pyetc HOST etcbrady
 		AFTER jwst
 		AFTER init/*
 
+TABLE test_final HOST ssb
+	CMD pyetc.expect RUN "test_import pyetc ; test_expected pyetc"
+		AFTER *:pyetc/*
+
diff --git a/sm/test_common.sm b/sm/test_common.sm
index 47bffa6..92d72e8 100644
--- a/sm/test_common.sm
+++ b/sm/test_common.sm
@@ -5,7 +5,13 @@ TABLE test_setup HOST herbert thor arzach bond cadeau banana
 # each of test_run_* says AFTER test_setup/*
 
 TABLE test_final HOST ssb
+        CMD notify RUN "test_notify daily"
+                AFTER *:test_import/*
+		AFTER test_final/pyetc.expect
+
 	CMD mysql_watch RUN "test_mysql_watch"
 		AFTER OPT dev.import
 		AFTER OPT x.import
 		AFTER init/*
+
+
diff --git a/sm/test_dev.sm b/sm/test_dev.sm
index 14830fe..f575e4c 100644
--- a/sm/test_dev.sm
+++ b/sm/test_dev.sm
@@ -25,9 +25,9 @@ TABLE test_run_dev HOST thor
 		AFTER stamp/dev
 		AFTER test2.7
 
-TABLE test_final HOST ssb
-        CMD dev.import RUN "test_import daily"
+TABLE test_import HOST ssb
+        CMD dev.import RUN "test_import irafdev"
                 AFTER *:test_run_dev/*
-        CMD dev.notify RUN "test_notify daily"
-                AFTER dev.import
-
+		AFTER *:pyetc/*
+        CMD dev.expect RUN "test_expected irafdev"
+                AFTER test_import/dev.import
diff --git a/sm/test_x.sm b/sm/test_x.sm
index 2f585b9..f92e103 100644
--- a/sm/test_x.sm
+++ b/sm/test_x.sm
@@ -16,9 +16,9 @@ TABLE test_run_x HOST arzach
 		AFTER stamp/x
 		AFTER test2.7
 
-TABLE test_final HOST ssb
-        CMD x.import RUN "test_import daily"
+TABLE test_import HOST ssb
+        CMD x.import RUN "test_import irafx"
                 AFTER *:test_run_x/*
-        CMD x.notify RUN "test_notify daily"
-                AFTER x.import
+        CMD x.expect RUN "test_expected irafx"
+                AFTER test_import/x.import
 
-- 
cgit