mathieu: utils/testing kolab-test-toolbox.ini, 1.1, 1.2 kolab-test-toolbox.pl, 1.1, 1.2

[cvs at kolab.org]

Author: mathieu

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv32395

Modified Files:
	kolab-test-toolbox.ini kolab-test-toolbox.pl 
Log Message:
renamed native to native_debian: this is not the only native port!

Index: kolab-test-toolbox.ini
===================================================================
RCS file: /kolabrepository/utils/testing/kolab-test-toolbox.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-test-toolbox.ini	3 Dec 2009 18:10:20 -0000	1.1
+++ kolab-test-toolbox.ini	3 Dec 2009 20:47:06 -0000	1.2
@@ -29,8 +29,8 @@
 php_test_dir=/usr/share/php/tests
 
 ; kolab conf
-; native|openpkg
-kolab_installation_method=native
+; native_debian|openpkg
+kolab_installation_method=openpkg
 kolabsrv=kolabsrv
 kolab_bootstrap=kolab_bootstrap
 kolab_manager_password=12345
@@ -64,7 +64,7 @@
 
 ip_offset=15
 
-kolab_installation_method=native
+kolab_installation_method=native_debian
 
 [debian-sid-native]
 storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-sid-native
@@ -74,5 +74,5 @@
 
 ip_offset=20
 
-kolab_installation_method=native
+kolab_installation_method=native_debian
 

Index: kolab-test-toolbox.pl
===================================================================
RCS file: /kolabrepository/utils/testing/kolab-test-toolbox.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-test-toolbox.pl	3 Dec 2009 18:10:20 -0000	1.1
+++ kolab-test-toolbox.pl	3 Dec 2009 20:47:06 -0000	1.2
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-kolab-test-toolbox - Script to test Debian native kolab packages using virtual machines.
+kolab-test-toolbox - Script to test kolab packages using virtual machines.
 
 =head1 SYNOPSIS
 
@@ -511,7 +511,7 @@
 EOF");
     # ====
     print "* Preparing packages:\n";
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         if(conf('vm_dist') eq 'lenny') {
             print "* Using packages from squeeze:\n";
             remote_command($domip, 'cat <<EOF > /etc/apt/sources.list.d/squeeze.list
@@ -554,7 +554,7 @@
     
     # ====
     print "* Installing:\n";
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         remote_command($domip, 'DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated install kolabd postfix slapd');
     } elsif(conf('kolab_installation_method') eq 'openpkg') {
         remote_command($domip, 'mkdir /kolab');
@@ -568,7 +568,7 @@
     }
     
     # ====
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         print "* Stopping services:\n";
         remote_command($domip, '/etc/init.d/apache2 stop');
         remote_command($domip, '/etc/init.d/kolabd stop');
@@ -897,7 +897,7 @@
 
     # ====
     print "* Starting services:\n";
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         remote_command($domip, '/etc/init.d/amavis start #optionally');
         remote_command($domip, '/etc/init.d/slapd start');
         remote_command($domip, '/etc/init.d/saslauthd start');
@@ -910,13 +910,13 @@
     }
 
     # ====
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         print "* Installing PHP Unit:\n";
         remote_command($domip, 'apt-get -qy install phpunit');
     }
 
     # ====
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         print "* Installing kolab-webadmin:\n";
         remote_command($domip, 'DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated install kolab-webadmin');