Changeset c12a5c8

Timestamp:

2011-01-04T01:00:00Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

ab094d9

Parents:

6f5ab2a

Message:

Make tests a bit more robust

Sometimes skyped exits on startup because of the failure of some
underlying C lib (ie we get no expections), that's not something I want
to care about.

Location:

skype/t

Files:

• irssi/skype-msg.test (modified) (1 diff)
• livetest-bitlbee.sh (modified) (3 diffs)

skype/t/irssi/skype-msg.test

@@ -9 +9 @@
 /expectbee 'Account successfully added' -command 'msg $$C account 0 set test_join true'
 /expectbee 'test_join' -command 'msg $$C account 0 on'
+# use builtin test service
+/expectjoin echo123 -command 'msg $$C echo123: ping, say pong'
+/expectbee 'pong' -command 'quit Test Passed'
+# use a public bot as well, just in case the above one would fail
 /expectjoin echo123 -command 'msg $$C add skype pam_bot'
 /expectjoin pam_bot -command 'msg $$C pam_bot: pambot help'

skype/t/livetest-bitlbee.sh

@@ -1 +1 @@
 #!/usr/bin/env bash
+
+start_skyped()
+{
+        python ../skyped.py "$@" > skypedtest.pid
+        while true
+        do
+                [ -e skypedtest.pid ] || break
+                pid=$(sed 's/.*: //' skypedtest.pid)
+                if [ -e /proc/$pid ]; then
+                        sleep 5
+                else
+                        start_skyped "$@"
+                        break
+                fi
+        done
+}
+
 BITLBEE=$1
 typeset -ix PORT=`echo $2 | egrep '^[0-9]{1,5}$'`
@@ -46 +63 @@
 
         # Run skyped
-        python ../skyped.py -c skyped.conf -l skypedtest.log > skypedtest.pid
+        start_skyped -c skyped.conf -l skypedtest.log &
         sleep 2
 fi
@@ -68 +85 @@
         # Kill skyped
         killall -TERM skype
-        kill -TERM $(sed 's/.*: //' skypedtest.pid)
+        if [ -f skypedtest.pid ]; then
+                pid=$(sed 's/.*: //' skypedtest.pid)
+                rm skypedtest.pid
+                [ -e /proc/$pid ] && kill -TERM $pid
+        fi
 fi