[omd-commits] OMD Git: omd: tests: verify package befor install

git version control git at mathias-kettner.de
Sun Dec 19 18:20:28 CET 2010


Module: omd
Branch: master
Commit: f229de3deb79fe75014889e0b43efa6d8e5a4a05
URL:    http://omdistro.org/projects/omd/repository/revisions/f229de3deb79fe75014889e0b43efa6d8e5a4a05

Author: Sven Nierlein <sven at nierlein.de>
Date:   Sun Dec 19 18:19:45 2010 +0100

tests: verify package befor install

---

 t/TestUtils.pm |    4 +++-
 t/test_all.sh  |    7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/t/TestUtils.pm b/t/TestUtils.pm
index 7d18995..86dc2ff 100644
--- a/t/TestUtils.pm
+++ b/t/TestUtils.pm
@@ -400,10 +400,12 @@ sub _get_url {
 =cut
 sub _clean_stderr {
     my $text = shift || '';
-    $text =~ s/httpd: Could not reliably determine the server's fully qualified domain name, using 127.0.0.1 for ServerName//;
+    $text =~ s/\w+: Could not reliably determine the server's fully qualified domain name, using .*? for ServerName//;
     return $text;
 }
 
+##################################################
+
 END {
     if(defined $omd_symlink_created and $omd_symlink_created == 1) {
         unlink('/omd');
diff --git a/t/test_all.sh b/t/test_all.sh
index ba4405c..33143ce 100755
--- a/t/test_all.sh
+++ b/t/test_all.sh
@@ -11,8 +11,13 @@ if [ $(id -u) -ne 0 ]; then
 fi
 
 # do we install a package?
-if [ ! -z $OMD_PACKAGE ]; then
+if [ ! -z "$OMD_PACKAGE" ]; then
     echo "###################################################################"
+
+    if [ ! -e "$OMD_PACKAGE" ]; then
+        echo "cannot install $OMD_PACKAGE: no such file"
+    fi
+
     echo "installing " `basename $OMD_PACKAGE`
 
     # Debian / Ubuntu



More information about the omd-commits mailing list