[omd-commits] OMD Git: omd: adjust omd tests to new apache error

git version control git at mathias-kettner.de
Thu Dec 18 16:20:53 CET 2014


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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Dec 18 15:05:09 2014 +0100
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Dec 18 15:05:09 2014 +0100

adjust omd tests to new apache error

when running omd rm --reuse <site> the next create will show
an error because it cannot access (the nonexisting) site.conf.

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 t/10-omd_testsite.t |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/10-omd_testsite.t b/t/10-omd_testsite.t
index 6817dfc..2343fa3 100644
--- a/t/10-omd_testsite.t
+++ b/t/10-omd_testsite.t
@@ -73,11 +73,11 @@ my $tests = [
   { cmd => $omd_bin." rm --reuse $site", stdin => "yes\n" },
   { cmd => "/usr/bin/id -u $site",       like => '/\d+/' },
   { cmd => "/usr/bin/id -g $site",       like => '/\d+/' },
-  { cmd => $omd_bin." create $site2",    like => '/Created new site '.$site2.'./' },
-  { cmd => $omd_bin." mv --reuse $site2 $site", like => '/Moving site '.$site2.' to '.$site.'.../' },
+  { cmd => $omd_bin." create $site2",    like => '/Created new site '.$site2.'./', errlike => '/ERROR: Failed to read config of site testsite./' },
+  { cmd => $omd_bin." mv --reuse $site2 $site", like => '/Moving site '.$site2.' to '.$site.'.../' , errlike => '/ERROR: Failed to read config of site testsite./' },
   { cmd => "/usr/bin/id -u $site2",      like => '/\d+/' },
   { cmd => "/usr/bin/id -g $site2",      like => '/\d+/' },
-  { cmd => $omd_bin." cp --reuse $site $site2",  like => '/Copying site '.$site.' to '.$site2.'.../', 
+  { cmd => $omd_bin." cp --reuse $site $site2",  like => '/Copying site '.$site.' to '.$site2.'.../',
                                          errlike => '/Apache port \d+ is in use\. I\'ve choosen \d+ instead\./' },
   { cmd => $omd_bin." cp --reuse $site $site2", errlike => '/must be empty/', exit => 1 },
   { cmd => $omd_bin." rm $site",         like => '/Restarting Apache...\s*OK/', stdin => "yes\n" },



More information about the omd-commits mailing list