[pkg-kolab] r1458 - pkg-kolab_testsuite

[Mathieu Parent]

Author: sathieu
Date: 2009-11-30 16:55:14 +0000 (Mon, 30 Nov 2009)
New Revision: 1458

Modified:
   pkg-kolab_testsuite/testsuite
   pkg-kolab_testsuite/testsuite.ini
Log:
kolabsrv and kolab_bootstrap

Modified: pkg-kolab_testsuite/testsuite
===================================================================
--- pkg-kolab_testsuite/testsuite	2009-11-29 23:08:19 UTC (rev 1457)
+++ pkg-kolab_testsuite/testsuite	2009-11-30 16:55:14 UTC (rev 1458)
@@ -576,6 +576,8 @@
         remote_command($domip, '/etc/init.d/saslauthd stop');
         remote_command($domip, '/etc/init.d/slapd stop');
         remote_command($domip, '/etc/init.d/amavis stop #optionally');
+    } elsif(conf('kolab_installation_method') eq 'openpkg') {
+        remote_command($domip, conf('kolabsrv').' rc all stop');
     }
     
     # ====
@@ -592,7 +594,7 @@
             sub {
                 my $fh = shift;
                 if( $step == 0 ) {
-                    $fh->send("kolab_bootstrap -b\n");
+                    $fh->send(conf('kolab_bootstrap')." -b\n");
                     $step++;
                     return exp_continue;
                 } elsif($step == 17 + conf('slave_count')) {

Modified: pkg-kolab_testsuite/testsuite.ini
===================================================================
--- pkg-kolab_testsuite/testsuite.ini	2009-11-29 23:08:19 UTC (rev 1457)
+++ pkg-kolab_testsuite/testsuite.ini	2009-11-30 16:55:14 UTC (rev 1458)
@@ -26,6 +26,8 @@
 ; kolab conf
 ; native|openpkg
 kolab_installation_method=native
+kolabsrv=kolabsrv
+kolab_bootstrap=kolab_bootstrap
 kolab_manager_password=12345
 ca_passphrase=12345678
 
@@ -42,6 +44,8 @@
 ip_offset=10
 
 kolab_installation_method=openpkg
+kolabsrv=/kolab/bin/openpkg
+kolab_bootstrap=/kolab/sbin/kolab_bootstrap
 
 [debian-lenny-native]
 storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-lenny-native