[pkg-kolab] r1415 - pkg-kolab_testsuite

[Mathieu Parent]

Author: sathieu
Date: 2009-11-18 19:35:44 +0000 (Wed, 18 Nov 2009)
New Revision: 1415

Modified:
   pkg-kolab_testsuite/testsuite
Log:
testsuite:
- replace /etc/hosts instead of appending
- kolab-snapshots/ repository is removed
- --allow-unauthenticated because snapshots are not
- partial kolab_bootstrap support for slaves


Modified: pkg-kolab_testsuite/testsuite
===================================================================
--- pkg-kolab_testsuite/testsuite	2009-11-18 18:48:21 UTC (rev 1414)
+++ pkg-kolab_testsuite/testsuite	2009-11-18 19:35:44 UTC (rev 1415)
@@ -428,20 +428,19 @@
     
     print "* Copying /etc/hosts file:\n";
     my $hosts = hosts_file();
-    system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip 'cat <<EOF >> /etc/hosts
+    system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip 'cat <<EOF > /etc/hosts
 $hosts
 EOF'");
     print "* Updating APT:\n";
     system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip 'cat <<EOF > /etc/apt/sources.list.d/kolab.list
 #kolab
-deb http://pkg-kolab.alioth.debian.org/packages kolab-snapshots/
 deb http://pkg-kolab.alioth.debian.org/packages UNRELEASED/
 EOF'");
     system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip 'apt-get -qq update'");
     print "* Following https://wiki.kolab.org/index.php/Debian_-_Administrators_-_Kolab_Installation\n";
 
     print "* Installing:\n";
-    system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip 'DEBIAN_FRONTEND=noninteractive apt-get -y install kolabd postfix slapd'");
+    system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip 'DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated install kolabd postfix slapd'");
     system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip '/etc/init.d/apache2 stop'");
     system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip '/etc/init.d/kolabd stop'");
     system("ssh -i '".$config{'storagepooldir'}."/key' root\@$domip '/etc/init.d/kolab-cyrus stop'");
@@ -455,6 +454,7 @@
     $exp->log_file("$domname.log");
     my $step = 0;
     $exp->expect(60, # 60 seconds (wait for OpenLDAP to start)
+        # << common
         [
             '-re', qr'[#>] $',#prompt
             sub {
@@ -498,7 +498,6 @@
                 }
             },
         ],
-        #Proceeding with Hostname kolab_test_master.local.tld
         [
             qr'Do you want to set up \(1\) a master Kolab server or \(2\) a slave \[1\] \(1/2\): $',
             sub {
@@ -516,6 +515,8 @@
                 }
             },
         ],
+        # >> common
+        # << master only
         [
             qr'Please enter your Maildomain - if you do not know your mail domain use the fqdn from above \['.$config{'dnsdomain'}.'\]: $',
             sub {
@@ -538,7 +539,7 @@
                     $step++;
                     return exp_continue;
                 } else {
-                    print "Step is $step\n";
+                    print "Step is $step (should be 5)\n";
                 }
             },
         ],
@@ -551,7 +552,7 @@
                     $step++;
                     return exp_continue;
                 } else {
-                    print "Step is $step\n";
+                    print "Step is $step (should be 6)\n";
                 }
             },
         ],
@@ -651,7 +652,55 @@
                 }
             },
         ],
+        # >> master only
+        # << slave only
         [
+            qr'URI of master LDAP server \(for example ldaps://host.example.com\): $',
+            sub {
+                my $fh = shift;
+                if( $step == 4 ) {
+                    $fh->send("ldaps://kolab_test_master.".$config{'dnsdomain'}."\n");
+                    $step++;
+                    return exp_continue;
+                } else {
+                    print "Step is $step (should be 4)\n";
+                }
+            },
+        ],
+        [
+            qr'Base DN of server \[dc=kolab_test_master,dc=local,dc=tld\]: $',
+            sub {
+                my $fh = shift;
+                if( $step == 5 ) {
+                    $fh->send("dc=local,dc=tld\n");
+                    $step++;
+                    return exp_continue;
+                } else {
+                    print "Step is $step (should be 5)\n";
+                }
+            },
+        ],
+        [
+            qr'Manager password: $',
+            sub {
+                my $fh = shift;
+                if( $step == 6 ) {
+                    $fh->send($config{'kolab_manager_password'}."\n");
+                    $step++;
+                    return exp_continue;
+                } else {
+                    print "Step is $step (should be 6)\n";
+                }
+            },
+        ],
+        #Are you sure you want to continue connecting (yes/no)? 
+        #root at kolab_test_master.local.tld's password: 
+        #Do you want to create a certificate request and sign it [y] (y/n): 
+        #root at kolab_test_master.local.tld's password: 
+        #root at kolab_test_master.local.tld's password: 
+        # >> slave only
+        # << common
+        [
             qr'Enter pass phrase for /etc/kolab/ca/private/cakey.pem:$',
             sub {
                 my $fh = shift;
@@ -690,6 +739,11 @@
                 }
             },
         ],
+        # >> common
+        # << slave only
+        #root at kolab_test_master.local.tld's password: 
+        #root at kolab_test_master.local.tld's password: 
+        # >> slave only
     );
 
     print "* Installing PHP Unit:\n";