9 new revisions:

Revision: 79b4dd5a0bf4
Author:   Jean Deruelle <[email protected]>
Date:     Tue Aug 28 14:13:53 2012
Log:      Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=79b4dd5a0bf4

Revision: ed1a53577211
Author:   Jean Deruelle <[email protected]>
Date:     Tue Aug 28 14:52:48 2012
Log:      Backoport to master...
http://code.google.com/p/sipservlets/source/detail?r=ed1a53577211

Revision: c81b993c5dfc
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 06:20:53 2012
Log:      Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=c81b993c5dfc

Revision: 54e6ad60a264
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 06:33:31 2012
Log:      Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=54e6ad60a264

Revision: 475b8146075a
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 06:45:40 2012
Log:      Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=475b8146075a

Revision: b18dc54bec5d
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 08:29:22 2012
Log:      Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=b18dc54bec5d

Revision: c59ab6b1a629
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 08:56:51 2012
Log:      Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=c59ab6b1a629

Revision: 4e7d7ed3ffe1
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 09:28:26 2012
Log:      Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=4e7d7ed3ffe1

Revision: df05afa02835
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 12:00:48 2012
Log:      Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=df05afa02835

==============================================================================
Revision: 79b4dd5a0bf4
Author:   Jean Deruelle <[email protected]>
Date:     Tue Aug 28 14:13:53 2012
Log:      Backport to master

trying to fix the script according to http://stackoverflow.com/questions/818255/in-the-bash-shell-what-is-21
(cherry picked from commit 0f4d1b584fb0d6cc0b478e245e7fb58c836201f6)

http://code.google.com/p/sipservlets/source/detail?r=79b4dd5a0bf4

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh Tue Aug 7 04:18:25 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh Tue Aug 28 14:13:53 2012
@@ -20,97 +20,97 @@
            proxy)
                        rm ./proxy/*.log
                        echo "Distributed example used is proxy";
- echo""| sipp $MSS_IP:5080 -sf proxy/location-service-receiver.xml -i $SIPP_IP -p 5090 -nd >sipp-uas-log-$1.txt 2&>1 & + echo""| sipp $MSS_IP:5080 -sf proxy/location-service-receiver.xml -i $SIPP_IP -p 5090 -nd >sipp-uas-log-$1.txt 2>&1 & sipp $MSS_IP:5080 -s receiver-failover -sf proxy/location-service-sender.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT -timeout_error -nd
                    ;;
            proxy-early)
                        rm ./proxy/*.log
                        echo "Distributed example used is proxy early dialog 
failover";
- echo""| sipp $MSS_IP:5080 -sf proxy/location-service-receiver-early.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf proxy/location-service-receiver-early.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver-failover -sf proxy/location-service-sender-early.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT -timeout_error -nd
                    ;;
            proxy-remote-send-bye)
                        rm ./proxy/*.log
                        echo "Distributed example used is proxy remote send 
bye";
- echo""| sipp $MSS_IP:5080 -sf proxy/location-service-receiver-sends-bye.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf proxy/location-service-receiver-sends-bye.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver-failover -sf proxy/location-service-sender-receives-bye.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -nd -timeout $ACTIVE_TIMEOUT -timeout_error
                    ;;
            proxy-indialog-info)
                        rm ./proxy/*.log
                        echo "Distributed example used is proxy indialog info";
- echo""| sipp $MSS_IP:5080 -sf proxy/location-service-indialog-info-receiver.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf proxy/location-service-indialog-info-receiver.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver-failover -sf proxy/location-service-indialog-info-sender.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -nd -timeout $ACTIVE_TIMEOUT -timeout_error
                        ;;
            proxy-termination)
                        rm ./proxy/*.log
                        echo "Distributed example used is proxy termination";
- echo""| sipp $MSS_IP:5080 -sf proxy/location-service-termination-receiver.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf proxy/location-service-termination-receiver.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver-failover -sf proxy/location-service-termination-sender.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -nd -timeout $ACTIVE_TIMEOUT -timeout_error
                        ;;
            custom-b2bua)
                        rm ./b2bua/*.log
                    echo "Distributed example used is custom b2bua";
- echo""| sipp $MSS_IP:5080 -sf b2bua/custom-call-forwarding-receiver.xml -trace_err -trace_msg -nd -i $SIPP_IP -p 5090 >sipp-uas-log-$1.txt 2&>1 & + echo""| sipp $MSS_IP:5080 -sf b2bua/custom-call-forwarding-receiver.xml -trace_err -trace_msg -nd -i $SIPP_IP -p 5090 >sipp-uas-log-$1.txt 2>&1 & sipp $MSS_IP:5080 -s receiver -sf b2bua/custom-call-forwarding-sender.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT -timeout_error -nd
                    ;;
            custom-b2bua-early)
                        rm ./b2bua/*.log
echo "Distributed example used is custom b2bua early dialog failover"; - echo""| sipp $MSS_IP:5080 -sf b2bua/custom-call-forwarding-receiver-early.xml -i $SIPP_IP -nd -p 5090
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf b2bua/custom-call-forwarding-receiver-early.xml -i $SIPP_IP -nd -p 5090
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver -sf b2bua/custom-call-forwarding-sender-early.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT -timeout_error -nd
                    ;;
            custom-b2bua-udp-tcp)
                        rm ./b2bua/*.log
                    echo "Distributed example used is custom b2bua udp tcp";
- echo""| sipp $MSS_IP:5080 -sf b2bua/custom-call-forwarding-receiver.xml -nd -i $SIPP_IP -p 5090 -t t1
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf b2bua/custom-call-forwarding-receiver.xml -nd -i $SIPP_IP -p 5090 -t t1
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver-tcp -sf b2bua/custom-call-forwarding-sender.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT -timeout_error -nd
                    ;;
            custom-b2bua-tcp-tcp)
                        rm ./b2bua/*.log
                    echo "Distributed example used is custom b2bua tcp tcp";
- echo""| sipp $MSS_IP:5080 -nd -sf b2bua/custom-call-forwarding-receiver.xml -i $SIPP_IP -p 5090 -t t1
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -nd -sf b2bua/custom-call-forwarding-receiver.xml -i $SIPP_IP -p 5090 -t t1
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver-tcp -nd -sf b2bua/custom-call-forwarding-sender.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT -t t1 -timeout_error
                    ;;
            b2bua)
                        rm ./b2bua/*.log
                    echo "Distributed example used is b2bua";
- echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver -sf b2bua/call-forwarding-sender.xml -trace_err -i $SIPP_IP -p 5050 -nd -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT $SIPP_OPTIONS -timeout_error
                    ;;
            b2bua-info)
                        rm ./b2bua/*.log
                    echo "Distributed example used is b2bua info";
- echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-info.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-info.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver -sf b2bua/call-forwarding-sender-info.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -nd -timeout $ACTIVE_TIMEOUT $SIPP_OPTIONS -timeout_error
                    ;;
            b2bua-early)
                        rm ./b2bua/*.log
echo "Distributed example used is b2bua early dialog failover"; - echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-early.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-early.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver -sf b2bua/call-forwarding-sender-early.xml -trace_err -nd -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT $SIPP_OPTIONS -timeout_error
                    ;;
            b2bua-early-linked)
                        rm ./b2bua/*.log
echo "Distributed example used is b2bua early dialog failover with linked requests"; - echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-early.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-early.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver-linked -sf b2bua/call-forwarding-sender-early.xml -nd -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT $SIPP_OPTIONS -timeout_error
                    ;;
            b2bua-early-fwd-ack)
                        rm ./b2bua/*.log
echo "Distributed example used is b2bua early dialog failover"; - echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-early.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-early.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver-fwd-ack -sf b2bua/call-forwarding-sender-early.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -nd -timeout $ACTIVE_TIMEOUT $SIPP_OPTIONS -timeout_error
                    ;;
            b2bua-remote-send-bye)
                        rm ./b2bua/*.log
                    echo "Distributed example used is b2bua-remote-send-bye";
- echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-sends-bye.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2&>1 &
+ echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-sends-bye.xml -i $SIPP_IP -p 5090 -nd
sipp-uas-log-$1.txt 2>&1 &
sipp $MSS_IP:5080 -s receiver -sf b2bua/call-forwarding-sender-receives-bye.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -nd -timeout $ACTIVE_TIMEOUT -timeout_error
                    ;;
            b2bua-remote-send-bye-no-ring)
                        rm ./b2bua/*.log
echo "Distributed example used is b2bua-remote-send-bye-no-ring"; - echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-sends-bye-no-ring.xml -i $SIPP_IP -p 5090 -nd >sipp-uas-log-$1.txt 2&>1 & + echo""| sipp $MSS_IP:5080 -sf b2bua/call-forwarding-receiver-sends-bye-no-ring.xml -i $SIPP_IP -p 5090 -nd >sipp-uas-log-$1.txt 2>&1 & sipp $MSS_IP:5080 -s receiver -sf b2bua/call-forwarding-sender-receives-bye.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -nd -timeout $ACTIVE_TIMEOUT -timeout_error
                    ;;
                uac)
@@ -214,7 +214,7 @@
            proxy-b2bua-ar)
                        rm ./ar/*.log
                        echo "Distributed example used is proxy-b2bua-ar";
- echo""| sipp $MSS_IP:5060 -sf ar/proxy-b2bua-ar-receiver.xml -i $SIPP_IP -p 5090 -nd >sipp-uas-log-$1.txt 2&>1 & + echo""| sipp $MSS_IP:5060 -sf ar/proxy-b2bua-ar-receiver.xml -i $SIPP_IP -p 5090 -nd >sipp-uas-log-$1.txt 2>&1 & sipp $MSS_IP:5060 -s receiver-failover -sf ar/proxy-b2bua-ar-sender.xml -trace_err -i $SIPP_IP -p 5050 -r $RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT -timeout_error
                    ;;
     esac

==============================================================================
Revision: ed1a53577211
Author:   Jean Deruelle <[email protected]>
Date:     Tue Aug 28 14:52:48 2012
Log:      Backoport to master

trying to fix the script according to get rid of the following message Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html that screws the parsing of the output and doesn't kill the server
(cherry picked from commit 642c2279a3474fd19157640a15b42ea7fe24711b)

http://code.google.com/p/sipservlets/source/detail?r=ed1a53577211

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh Sun Mar 20 16:56:03 2011 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh Tue Aug 28 14:52:48 2012
@@ -1,7 +1,7 @@
 #!/bin/sh
 export pid=$1
 killed="no"
-for child in $(ps -o pid,ppid -ax | \
+for child in $(ps -o pid,ppid ax | \
    awk "{ if ( \$2 == $pid ) { print \$1 }}")
 do
   echo "Killing script $2 child process $child because parent pid = $pid"

==============================================================================
Revision: c81b993c5dfc
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 06:20:53 2012
Log:      Backport to master

trying to discover why the node doesn't get killed
(cherry picked from commit bb3c9034f676ff3416c1ddb12537647e4eabc697)

Conflicts:

sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh

http://code.google.com/p/sipservlets/source/detail?r=c81b993c5dfc

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh /sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Sun Apr 8 19:19:15 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 06:20:53 2012
@@ -3,6 +3,7 @@
 export config1="all"
 export config2="port-1"
 export KILL_PARAMS="-9"
+
 export FULLSTARTSLEEP=700
 export HALFSTARTSLEEP=700
 export CALLS=5
=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh Tue Aug 28 14:52:48 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh Wed Aug 29 06:20:53 2012
@@ -1,6 +1,9 @@
 #!/bin/sh
 export pid=$1
-killed="no"
+export killed="no"
+
+echo "Trying Killing script $2 child process with parent pid = $pid"
+
 for child in $(ps -o pid,ppid ax | \
    awk "{ if ( \$2 == $pid ) { print \$1 }}")
 do
@@ -8,7 +11,7 @@
   kill $child # clean kill with shutdown instruction
   sleep .4 # give some time for the clean shutdown to reach out
   kill -9 $child # kill it immediately without wasting more time
-  killed="yes"
+  export killed="yes"
 done

 if [ "yes" = $killed ]; then

==============================================================================
Revision: 54e6ad60a264
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 06:33:31 2012
Log:      Backport to master
revert change
(cherry picked from commit 09913890b9e1b9f6c0c77b0557a5c71afcd4303d)

Conflicts:

sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh

http://code.google.com/p/sipservlets/source/detail?r=54e6ad60a264

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 06:20:53 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 06:33:31 2012
@@ -4,8 +4,8 @@
 export config2="port-1"
 export KILL_PARAMS="-9"

-export FULLSTARTSLEEP=700
-export HALFSTARTSLEEP=700
+export FULLSTARTSLEEP=200
+export HALFSTARTSLEEP=200
 export CALLS=5

 if [ "x$1" != "x" ]; then

==============================================================================
Revision: 475b8146075a
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 06:45:40 2012
Log:      Backport to master

trying to fix the script according to http://stackoverflow.com/questions/818255/in-the-bash-shell-what-is-21
(cherry picked from commit 975d09cf0cab40512c8746443c00ecd7b53cb633)

http://code.google.com/p/sipservlets/source/detail?r=475b8146075a

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/auto-start-jboss-server.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-start-jboss-server.sh Sun Apr 8 19:19:15 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-start-jboss-server.sh Wed Aug 29 06:45:40 2012
@@ -1,9 +1,9 @@
export JAVA_OPTS="-server -Xms1536m -Xmx1536m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
 if [ "0" = $3 ]; then
   echo "Port configuration is 0. Using default command. No need for hacks."
- $JBOSS_HOME/bin/run.sh -Djboss.server.log.threshold=INFO -c $1 &> "jboss-$1-$4.out"& + $JBOSS_HOME/bin/run.sh -Djboss.server.log.threshold=INFO -c $1 > jboss-$1-$4.out 2>&1 &
 else
- $JBOSS_HOME/bin/run.sh -Djboss.server.log.threshold=INFO -c $1 -Djboss.service.binding.set=ports-0$3 -Djboss.messaging.ServerPeerID=$3 &> "jboss-$1-$4.out"& + $JBOSS_HOME/bin/run.sh -Djboss.server.log.threshold=INFO -c $1 -Djboss.service.binding.set=ports-0$3 -Djboss.messaging.ServerPeerID=$3 > jboss-$1-$4.out 2>&1 &
 fi
 export jbosspid=$!
echo "Starting app server. The pid for $2 is $jbosspid and other options ports are $3 config is $4"

==============================================================================
Revision: b18dc54bec5d
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 08:29:22 2012
Log:      Backport to master

fixing wrong value for test checking
(cherry picked from commit 87f285d05604bd42c802bc78e6c8fff5980ffc8c)

http://code.google.com/p/sipservlets/source/detail?r=b18dc54bec5d

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh Wed Aug 29 06:20:53 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-kill-process-tree.sh Wed Aug 29 08:29:22 2012
@@ -14,7 +14,7 @@
   export killed="yes"
 done

-if [ "yes" = $killed ]; then
+if [ "no" = $killed ]; then
echo "The app server is not dead? We will sleep. We must raise error here, because this server should have been dead."
   sleep 1
 fi

==============================================================================
Revision: c59ab6b1a629
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 08:56:51 2012
Log:      Backport to master

try fixing UAC test
(cherry picked from commit bb77d8f79b3bc7ed7d1548d9bb01dce6ba357df6)

http://code.google.com/p/sipservlets/source/detail?r=c59ab6b1a629

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 06:33:31 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 08:56:51 2012
@@ -556,7 +556,7 @@

# SIPp should be running by the time JBoss finishes the startup, hence we use half start time here.

-sleep 50
+sleep 5
 ./auto-run-test.sh uac result.txt $CALLS

 #Kill the app servers

==============================================================================
Revision: 4e7d7ed3ffe1
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 09:28:26 2012
Log:      Backport to master

adding config of profiles in script
(cherry picked from commit 3c4bbf1c8da100581de06c818b0c45c24aaabae1)

http://code.google.com/p/sipservlets/source/detail?r=4e7d7ed3ffe1

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 08:56:51 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 09:28:26 2012
@@ -16,6 +16,14 @@
     export HALFSTARTSLEEP=$2
 fi

+if [ "x$4" != "x" ]; then
+    export config1=$4
+fi
+
+if [ "x$5" != "x" ]; then
+    export config2=$5
+fi
+
 export EXIT_CODE=0;

 rm -rf result.txt

==============================================================================
Revision: df05afa02835
Author:   Jean Deruelle <[email protected]>
Date:     Wed Aug 29 12:00:48 2012
Log:      Backport to master

adding log messages
(cherry picked from commit aaf49d7b80a13d09a2cf90e678fd10618fc78e00)

http://code.google.com/p/sipservlets/source/detail?r=df05afa02835

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh /sip-servlets-test-suite/sipp-scenarios/clustering/auto-generate-junit-test-report.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 09:28:26 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh Wed Aug 29 12:00:48 2012
@@ -622,4 +622,5 @@

 ./auto-generate-junit-test-report.sh result.txt report.xml

+echo "exit code $EXIT_CODE"
 exit $EXIT_CODE
=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/auto-generate-junit-test-report.sh Tue Mar 16 19:39:13 2010 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/auto-generate-junit-test-report.sh Wed Aug 29 12:00:48 2012
@@ -1,3 +1,4 @@
+echo "generating tests reports"
 export numTests=`cat $1 | wc -l`
 export numPassed=`grep "0" $1 | wc -l`
 export reportfile=$2

Reply via email to