Changeset 86 for trunk/test

Timestamp:

Jan 20, 2007, 11:04:59 PM (18 years ago)

Author:

rainer

Message:

More thorough fix for ticket #47, and corresponding regression test.

Location:

trunk/test

Files:

• testrc_2.in (modified) (3 diffs)
• testrun_2c.sh (modified) (3 diffs)

trunk/test/testrc_2.in

@@ +1 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 #####################################################################
 #
@@ -103 +106 @@
 #AddToDBHash=log_msg
 # AddToDBHash=log_host
-
+UsePersistent = True
 
 [Utmp]
@@ -201 +204 @@
 
 [Clients]
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFsTXBGq0myA9XH2wRAju6AKDsNT3cVYHVs4z+ZHdFgPwOdvESewCfcIAY
+RsnSZyhwBGtlA+rf35/gcQw=
+=Rb0p
+-----END PGP SIGNATURE-----

trunk/test/testrun_2c.sh

@@ -24 +24 @@
 CLIENT_BUILDOPTS="--quiet  $TRUST --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --enable-network=client --disable-mail --disable-external-scripts --enable-login-watch --enable-xml-log --enable-db-reload --with-logserver=localhost --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export CLIENT_BUILDOPTS
 
+MAXTEST=3; export MAXTEST
+
+testrun_threesockets () {
+
+    GPG="$1"
+
+    [ -z "$verbose" ] || { 
+        echo; 
+        echo Working directory: $PW_DIR; echo MAKE is $MAKE; echo GPG is $GPG;
+        echo; 
+    }
+
+    [ -z "$verbose" ] || { echo; echo "${S}Building client and server${E}"; echo; }
+
+    if test -r "Makefile"; then
+        $MAKE distclean
+    fi
+
+    ${TOP_SRCDIR}/configure --with-gpg=${GPG} --with-checksum=no ${SERVER_BUILDOPTS} >/dev/null 2>&1
+
+    if test x$? = x0; then
+        [ -z "$verbose" ] ||     log_msg_ok "configure..."; 
+        $MAKE  > /dev/null 2>>test_log
+        if test x$? = x0; then
+            [ -z "$verbose" ] || log_msg_ok "make..."; 
+        else
+            [ -z "$quiet" ] &&   log_msg_fail "make..."; 
+            return 1
+        fi
+    else
+        [ -z "$quiet" ] &&       log_msg_fail "configure...";
+        return 1
+    fi
+
+    rm -f ./.samhain_file
+    rm -f ./.samhain_log
+    rm -f ./.samhain_lock
+    rm -f ./rc.${SH_LOCALHOST}
+    rm -f ./file.${SH_LOCALHOST}
+    
+    cp ${SCRIPTDIR}/testrc_2.in testrc_2
+    
+    ORIGINAL="DatabaseSeverity=none"
+    REPLACEMENT="DatabaseSeverity=warn"
+    ex -s $RCFILE <<EOF
+%s/$ORIGINAL/$REPLACEMENT/g
+wq
+EOF
+
+    ORIGINAL="MailSeverity=none"
+    REPLACEMENT="MailSeverity=crit"
+    ex -s $RCFILE <<EOF
+%s/$ORIGINAL/$REPLACEMENT/g
+wq
+EOF
+    return 0
+ }
+
 check_mysql_log () {
     DATE="$1"
@@ -58 +116 @@
     return 0
 }
-
-MAXTEST=2; export MAXTEST
 
 testrun2c ()
@@ -127 +183 @@
         PID=`cat .samhain_lock`
         kill $PID
+    else
+        log_fail 2 ${MAXTEST} "Three sockets open";
+    fi
+    #
+    GPG=`find_path gpg`
+    if [ -z "$GPG" ]; then
+        log_skip 1 $MAXTEST 'gpg not found in $PATH'
+    else
+        eval "$GPG" --list-keys 0F571F6C >/dev/null 2>/dev/null
+        if [ $? -ne 0 ]; then
+            log_skip 1 $MAXTEST 'public PGP key 0x0F571F6C not present'
+        else
+            testrun_threesockets "$GPG"
+
+            if [ -f ./yule ]; then
+                ./yule -D >/dev/null 2>>test_log 
+                five_sec_sleep
+                netstat -pant 2>/dev/null | grep 49777 | grep yule >/dev/null 2>&1
+                if [ $? -ne 0 ]; then
+                    [ -z "$quiet" ] && log_fail 3 ${MAXTEST} "Three sockets open (gpg)";
+                else
+                    NSOCK=`netstat -pand 2>/dev/null | grep STREAM | grep yule | wc -l`
+                    if [ $NSOCK -ne 2 ]; then
+                        [ -z "$quiet" ] && log_fail 3 ${MAXTEST} "Three sockets open (gpg)";
+                        netstat -pand 2>/dev/null | grep yule 
+                    else
+                        [ -z "$quiet" ] && log_ok   3 ${MAXTEST} "Three sockets open (gpg)";
+                    fi
+                fi
+                PID=`cat .samhain_lock`
+                kill $PID
+            else
+                log_fail 3 ${MAXTEST} "Three sockets open (gpg)";
+            fi
+        fi
     fi
     #