Changeset 207 for trunk/test

Timestamp:

Jan 16, 2009, 11:52:26 PM (16 years ago)

Author:

katerina

Message:

Fix for ticket #134 (size may get truncated to INT_MAX)

Location:

trunk/test

Files:

• testrun_1.sh (modified) (4 diffs)
• testrun_2a.sh (modified) (1 diff)
• testrun_2d.sh (modified) (1 diff)

trunk/test/testrun_1.sh

@@ -190 +190 @@
 #
 TESTPOLICY_11="
+[Misc]
+UseAclCheck=yes
+UseSelinuxCheck=yes
 [ReadOnly]
 dir=99${BASE}
@@ -231 +234 @@
 
 TESTPOLICY_10="
+[Misc]
+UseAclCheck=yes
+UseSelinuxCheck=yes
 [ReadOnly]
 dir=99${BASE}
@@ -253 +259 @@
     # CDIRS="a b c a/a a/b a/c a/a/a a/a/b a/a/c a/a/a/a a/a/a/b a/a/a/c";
     tmp=`grep CRIT $LOGFILE | wc -l`
-    if [ $tmp -ne 3 ]; then
+    if [ $tmp -ne 5 ]; then
         [ -z "$verbose" ] || log_msg_fail "policy count";
         return 1
@@ -1241 +1247 @@
           let "tcount = tcount + 1" >/dev/null
           #
-          if [ -z "$doall" -a $tcount -eq 10 ]; then
-              log_skip 10 $MAXTEST 'ACL/SELinux test (or use --really-all)'
-              let "tcount = tcount + 1" >/dev/null
-          fi
-          #
-          if [ -z "$doall" -a $tcount -eq 11 ]; then
-              log_skip 11 $MAXTEST 'ACL/SELinux test (or use --really-all)'
-              let "tcount = tcount + 1" >/dev/null
+          if [ $tcount -eq 10 ]; then
+              if [ -z "$doall" ]; then
+                  log_skip 10 $MAXTEST 'ACL/SELinux test (or use --really-all)'
+                  log_skip 11 $MAXTEST 'ACL/SELinux test (or use --really-all)'
+                  let "tcount = tcount + 2" >/dev/null
+              else
+                  # 'id -u' is posix
+                  #
+                  if test -f /usr/xpg4/bin/id
+                  then
+                      my_uid=`/usr/xpg4/bin/id -u`
+                  else
+                      my_uid=`id -u`
+                  fi
+                  #
+                  if [ ${my_uid} -ne 0 ]; then
+                      log_skip 10 $MAXTEST 'ACL/SELinux test (you are not root)'
+                      log_skip 11 $MAXTEST 'ACL/SELinux test (you are not root)'
+                      let "tcount = tcount + 2" >/dev/null
+                  else
+
+                      SETFATTR=`find_path setfattr`
+                      if [ -z "$SETFATTR" ]; then
+                          log_skip 10 $MAXTEST 'ACL/SELinux test (setfattr not in path)'
+                          log_skip 11 $MAXTEST 'ACL/SELinux test (setfattr not in path)'
+                          let "tcount = tcount + 2" >/dev/null
+                      fi
+                  fi
+              fi
           fi
           #

trunk/test/testrun_2a.sh

@@ -221 +221 @@
         cp    ./testrc_2       ./rc.${SH_LOCALHOST}
         mv    ./.samhain_file  ./file.${SH_LOCALHOST}
+        chmod 644 ./rc.${SH_LOCALHOST}
+        chmod 644 ./file.${SH_LOCALHOST}
 
         ALTHOST=`find_hostname`
         cp    ./testrc_2       "./rc.${ALTHOST}"
         cp    ./file.${SH_LOCALHOST} "./file.${ALTHOST}" 2>/dev/null
+        chmod 644 ./rc.${ALTHOST}
+        chmod 644 ./file.${ALTHOST}
 }
 

trunk/test/testrun_2d.sh

@@ -38 +38 @@
     # PGPASSWORD=samhain; export PGPASSWORD
     create_pgpass
-    psql -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';" >test_log_db
+    psql -o test_log_db -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';"
     #
     egrep "START.*Yule" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        [ -z "$verbose" ] || log_msg_fail "Server start";
+        [ -z "$verbose" ] || log_msg_fail "Server start (psql)";
         return 1
     fi
     egrep "NEW CLIENT" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        [ -z "$verbose" ] || log_msg_fail "Client connect";
+        [ -z "$verbose" ] || log_msg_fail "Client connect (psql)";
         return 1
     fi
     egrep "Checking.*/bin" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        [ -z "$verbose" ] || log_msg_fail "Client file check";
+        [ -z "$verbose" ] || log_msg_fail "Client file check (psql)";
         return 1
     fi
     egrep "EXIT.*Samhain" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        [ -z "$verbose" ] || log_msg_fail "Client exit";
+        [ -z "$verbose" ] || log_msg_fail "Client exit (psql)";
         return 1
     fi
     egrep "EXIT.*Yule.*SIGTERM" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        [ -z "$verbose" ] || log_msg_fail "Server exit";
+        [ -z "$verbose" ] || log_msg_fail "Server exit (psql)";
         return 1
     fi