Changeset 878 for trunk/Monitoring

Timestamp:

06/13/13 06:31:36 (11 years ago)

Author:

jripsl

Message:

Remove blank line from scenarios.

Location:

trunk/Monitoring/libIGCM_mock

Files:

• libIGCM_mock.sh (modified) (4 diffs)
• scenario/start_simu__fatal_error__stop_simu (modified) (1 diff)
• scenario/start_simu__simu_segfault (modified) (1 diff)

trunk/Monitoring/libIGCM_mock/libIGCM_mock.sh

@@ -64 +64 @@
    $0 -m stackfile -f ../sample/stack_light
 
+
    To list scenarios, do:
 
    $0 -l
 
-   To run scenario <scenario>, do:
-
-   $0 -s <scenario>
+
+   To run a scenario, do:
+
+   $0 -s <scenario_filename>
+
+
+   To remove tests data from the backend, do:
+
+   $0 -m cleanup
 EOF
         exit 2
@@ -115 +122 @@
   s)    l__scenariofile="$OPTARG"
 
-                if [[ "$l__scenariofile" =~ "*/*" ]]; then
+                if [[ "$l__scenariofile" =~ "/" ]]; then
                         # full/relative path was given with the filename
 
@@ -139 +146 @@
                 exit 1
         fi
+
+        #send_cleanup_msg # cleanup any previous tests on the backend side
 
         while read LINE <&3; do
@@ -228 +237 @@
 
                 if [ "$g__confirm" = "1" ]; then
-                        read -p "<<< $l__JSON_msg_buf >>>> sent. Press enter for next message" bla
+                        read -p "<<< $( echo $l__JSON_msg_buf | cut -c 0-70 ) >>>> sent. Press enter for next message" bla
                 else
-                        echo "<<< $l__JSON_msg_buf .>>>>"
+                        echo "<<< $( echo $l__JSON_msg_buf | cut -c 0-70 ) >>>> sent."
                         sleep $g__delay
                 fi

trunk/Monitoring/libIGCM_mock/scenario/start_simu__fatal_error__stop_simu

@@ -4 +4 @@
 simuid=BIGBRO.clim.TEST.LMDZOR.p86denv.TGCC.CURIE jobid=BIGBRO.clim.TEST.LMDZOR.p86denv.TGCC.CURIE.1 code=9000 timestamp=2013-06-11-15:26:28
 simuid=BIGBRO.clim.TEST.LMDZOR.p86denv.TGCC.CURIE jobid=BIGBRO.clim.TEST.LMDZOR.p86denv.TGCC.CURIE.1 code=9999 timestamp=2013-06-11-15:26:28
-

trunk/Monitoring/libIGCM_mock/scenario/start_simu__simu_segfault

@@ -4 +4 @@
 simuid=BIGBRO.clim.TEST.LMDZOR.p86denv.TGCC.CURIE jobid=BIGBRO.clim.TEST.LMDZOR.p86denv.TGCC.CURIE.1 code=9000 timestamp=2013-06-11-15:26:28
 simuid=BIGBRO.clim.TEST.LMDZOR.p86denv.TGCC.CURIE jobid=BIGBRO.clim.TEST.LMDZOR.p86denv.TGCC.CURIE.1 code=9999 timestamp=2013-06-11-15:26:28
-