Index: trunk/ippToPsps/test/fulltest.sh =================================================================== --- trunk/ippToPsps/test/fulltest.sh (revision 35456) +++ trunk/ippToPsps/test/fulltest.sh (revision 37246) @@ -1,5 +1,5 @@ #!/bin/csh -f -chmod +x *.dvo *.sh +chmod +x mkgpc1data.dvo mkgpc1.sh # a bit crude : get the datadir path by interpollation of the PATH element for psconfig @@ -14,4 +14,5 @@ # before running this test, you must have a mysql user: # mkgpc1.sh user localhost eam eam + set mkgpc1 = 1 set initdb = 1 @@ -157,5 +158,4 @@ mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test" mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql - endif @@ -168,31 +168,7 @@ mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch" mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch" - ippjython setupScratchDb.py -test -endif - -# `name` -# `datastore_product` -# `datastore_type` -# `datastore_publish` -# `dvo_label` -# `dvo_location` -# `min_ra` -# `max_ra` -# `min_dec` -# `max_dec` -# `box_size` -# `base_path` -# `data_release` -# `delete_local` -# `delete_datastore` -# `delete_dxlayer` -# `epoch` -# `survey` -# `psps_survey` -# `queue_P2` -# `queue_ST` -# `queue_OB` -# `active` -# `parallel` + ippjython setupScratchDb.py -test < /dev/null + if ($status) exit +endif # this is poor : we need to queue something in order to generate an init batch @@ -203,32 +179,38 @@ echo " ---- make skychunk for IN batches ----" - ippjython queue.py -test edit < initbatch.dat # skychunk name + echo "test_ds " >> initbatch.dat # datastore_product + echo "IPP_PSPS " >> initbatch.dat # datastore_type + echo "0 " >> initbatch.dat # datastore_publish + echo "none " >> initbatch.dat # dvo_label + echo "none " >> initbatch.dat # dvo_location + echo "0 " >> initbatch.dat # min_ra + echo "0 " >> initbatch.dat # max_ra + echo "0 " >> initbatch.dat # min_dec + echo "0 " >> initbatch.dat # max_dec + echo "2 " >> initbatch.dat # box_size + echo "none " >> initbatch.dat # base_path + echo "0 " >> initbatch.dat # data_release + echo "0 " >> initbatch.dat # delete_local + echo "1 " >> initbatch.dat # delete_datastore + echo "1 " >> initbatch.dat # delete_dxlayer + echo "2012-12-10 00:00:00.0 " >> initbatch.dat # epoch + echo "3PI " >> initbatch.dat # survey + echo "3PI " >> initbatch.dat # psps_survey + echo "0 " >> initbatch.dat # queue_P2 + echo "0 " >> initbatch.dat # queue_ST + echo "0 " >> initbatch.dat # queue_OB + echo "0 " >> initbatch.dat # queue_DF + echo "0 " >> initbatch.dat # queue_DO + echo "0 " >> initbatch.dat # queue_FW + echo "0 " >> initbatch.dat # queue_FO + echo "1 " >> initbatch.dat # active + echo "0 " >> initbatch.dat # parallel + echo "use_new " >> initbatch.dat # P2_smf_version + echo "any " >> initbatch.dat # ST_cmf_version + echo "2000-01-01 00:00:00.0 " >> initbatch.dat # trange_start + echo "2020-01-01 00:00:00.0 " >> initbatch.dat # trange_end + cat initbatch.dat | ippjython queue.py -test edit + if ($status) exit echo "" @@ -236,5 +218,6 @@ rm -rf $OUTDIR/IN - ippjython loader.py -test initbatch init + ippjython loader.py -test initbatch init -simtest < /dev/null + if ($status) exit endif @@ -244,32 +227,38 @@ echo " ---- queue P2 batches ----" - ippjython queue.py -test edit < cambatch.dat # skychunk name + echo "test_ds " >> cambatch.dat # datastore_product + echo "IPP_PSPS " >> cambatch.dat # datastore_type + echo "0 " >> cambatch.dat # datastore_publish + echo "catdir.cam " >> cambatch.dat # dvo_label + echo "$OUTDIR/catdir.cam " >> cambatch.dat # dvo_location + echo "9 " >> cambatch.dat # min_ra + echo "11 " >> cambatch.dat # max_ra + echo "19 " >> cambatch.dat # min_dec + echo "21 " >> cambatch.dat # max_dec + echo "2 " >> cambatch.dat # box_size + echo "$OUTDIR " >> cambatch.dat # base_path + echo "0 " >> cambatch.dat # data_release + echo "0 " >> cambatch.dat # delete_local + echo "1 " >> cambatch.dat # delete_datastore + echo "1 " >> cambatch.dat # delete_dxlayer + echo "2012-12-10 00:00:00.0 " >> cambatch.dat # epoch + echo "3PI " >> cambatch.dat # survey + echo "3PI " >> cambatch.dat # psps_survey + echo "1 " >> cambatch.dat # queue_P2 + echo "0 " >> cambatch.dat # queue_ST + echo "0 " >> cambatch.dat # queue_OB + echo "0 " >> cambatch.dat # queue_DF + echo "0 " >> cambatch.dat # queue_DO + echo "0 " >> cambatch.dat # queue_FW + echo "0 " >> cambatch.dat # queue_FO + echo "1 " >> cambatch.dat # active + echo "0 " >> cambatch.dat # parallel + echo "use_new " >> cambatch.dat # P2_smf_version + echo "any " >> cambatch.dat # ST_cmf_version + echo "2000-01-01 00:00:00.0 " >> cambatch.dat # trange_start + echo "2020-01-01 00:00:00.0 " >> cambatch.dat # trange_end + cat cambatch.dat | ippjython queue.py -test edit -simtest + if ($status) exit endif @@ -279,5 +268,6 @@ rm -rf $OUTDIR/P2 - ippjython loader.py -test $queuename once + ippjython loader.py -test $queuename once -simtest < /dev/null + if ($status) exit endif @@ -290,32 +280,38 @@ set stackqueuename = $queuename\_stk endif - ippjython queue.py -test edit < stackbatch.dat # skychunk name + echo "test_ds " >> stackbatch.dat # datastore_product + echo "IPP_PSPS " >> stackbatch.dat # datastore_type + echo "0 " >> stackbatch.dat # datastore_publish + echo "catdir.stk " >> stackbatch.dat # dvo_label + echo "$OUTDIR/catdir.stk " >> stackbatch.dat # dvo_location + echo "9 " >> stackbatch.dat # min_ra + echo "11 " >> stackbatch.dat # max_ra + echo "19 " >> stackbatch.dat # min_dec + echo "21 " >> stackbatch.dat # max_dec + echo "2 " >> stackbatch.dat # box_size + echo "$OUTDIR " >> stackbatch.dat # base_path + echo "0 " >> stackbatch.dat # data_release + echo "0 " >> stackbatch.dat # delete_local + echo "1 " >> stackbatch.dat # delete_datastore + echo "1 " >> stackbatch.dat # delete_dxlayer + echo "2012-12-10 00:00:00.0 " >> stackbatch.dat # epoch + echo "3PI " >> stackbatch.dat # survey + echo "3PI " >> stackbatch.dat # psps_survey + echo "0 " >> stackbatch.dat # queue_P2 + echo "1 " >> stackbatch.dat # queue_ST + echo "0 " >> stackbatch.dat # queue_OB + echo "0 " >> stackbatch.dat # queue_DF + echo "0 " >> stackbatch.dat # queue_DO + echo "0 " >> stackbatch.dat # queue_FW + echo "0 " >> stackbatch.dat # queue_FO + echo "1 " >> stackbatch.dat # active + echo "0 " >> stackbatch.dat # parallel + echo "use_new " >> stackbatch.dat # P2_smf_version + echo "any " >> stackbatch.dat # ST_cmf_version + echo "2000-01-01 00:00:00.0 " >> stackbatch.dat # trange_start + echo "2020-01-01 00:00:00.0 " >> stackbatch.dat # trange_end + cat stackbatch.dat | ippjython queue.py -test edit -simtest + if ($status) exit endif @@ -328,5 +324,6 @@ endif rm -rf $OUTDIR/ST - ippjython loader.py -test $stackqueuename once + ippjython loader.py -test $stackqueuename once -simtest < /dev/null + if ($status) exit endif @@ -339,32 +336,38 @@ set objectqueuename = $queuename\_obj endif - ippjython queue.py -test edit < objectbatch.dat # skychunk name + echo "test_ds " >> objectbatch.dat # datastore_product + echo "IPP_PSPS " >> objectbatch.dat # datastore_type + echo "0 " >> objectbatch.dat # datastore_publish + echo "catdir.cam " >> objectbatch.dat # dvo_label + echo "$OUTDIR/catdir.cam " >> objectbatch.dat # dvo_location + echo "9 " >> objectbatch.dat # min_ra + echo "11 " >> objectbatch.dat # max_ra + echo "19 " >> objectbatch.dat # min_dec + echo "21 " >> objectbatch.dat # max_dec + echo "2 " >> objectbatch.dat # box_size + echo "$OUTDIR " >> objectbatch.dat # base_path + echo "0 " >> objectbatch.dat # data_release + echo "0 " >> objectbatch.dat # delete_local + echo "1 " >> objectbatch.dat # delete_datastore + echo "1 " >> objectbatch.dat # delete_dxlayer + echo "2012-12-10 00:00:00.0 " >> objectbatch.dat # epoch + echo "3PI " >> objectbatch.dat # survey + echo "3PI " >> objectbatch.dat # psps_survey + echo "0 " >> objectbatch.dat # queue_P2 + echo "0 " >> objectbatch.dat # queue_ST + echo "1 " >> objectbatch.dat # queue_OB + echo "0 " >> objectbatch.dat # queue_DF + echo "0 " >> objectbatch.dat # queue_DO + echo "0 " >> objectbatch.dat # queue_FW + echo "0 " >> objectbatch.dat # queue_FO + echo "1 " >> objectbatch.dat # active + echo "0 " >> objectbatch.dat # parallel + echo "use_new " >> objectbatch.dat # P2_smf_version + echo "any " >> objectbatch.dat # ST_cmf_version + echo "2000-01-01 00:00:00.0 " >> objectbatch.dat # trange_start + echo "2020-01-01 00:00:00.0 " >> objectbatch.dat # trange_end + cat objectbatch.dat | ippjython queue.py -test edit once -simtest + if ($status) exit endif @@ -377,5 +380,7 @@ endif rm -rf $OUTDIR/OB - ippjython loader.py -test $objectqueuename once -endif - + + ippjython loader.py -test $objectqueuename once -simtest < /dev/null + if ($status) exit +endif +