Merge pull request #3975 from cyrusimap/cass-high-port

PortManager: start at port 29100
cyrusimap · Oct 2, 2024 · a651631 · a651631
2 parents 53ad74e + 400da32
commit a651631
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/cassandane/Cassandane/PortManager.pm b/cassandane/Cassandane/PortManager.pm
@@ -61,9 +61,8 @@ sub alloc
         die "Invalid TEST_UNIT_WORKER_ID - code not run in Worker context"
             if (defined($workerid) && $workerid eq 'invalid');
         my $cassini = Cassandane::Cassini->instance();
-        my $cassini_base_port = $cassini->val('cassandane', 'base_port') // 0;
-        $base_port = 0 + $cassini_base_port || 9100;
-        $base_port += $max_ports * ($workerid-1);
+        my $cassandane_base_port = 0 + $cassini->val('cassandane', 'base_port', '29100');
+        $base_port = $cassandane_base_port + $max_ports * ($workerid-1);
     }
     for (my $i = 0 ; $i < $max_ports ; $i++)
     {

diff --git a/cassandane/Cassandane/Test/Cassini.pm b/cassandane/Cassandane/Test/Cassini.pm
@@ -192,7 +192,7 @@ sub test_environment_override
         'cassandane.pwcheck' => 'alwaystrue',
         'cassandane.cleanup' => 'no',
         'cassandane.maxworkers' => '1',
-        'cassandane.base_port' => '9100',
+        'cassandane.base_port' => '29100',
         'cassandane.suppress' => '',
         'valgrind.enabled' => 'no',
         'valgrind.binary' => '/usr/bin/valgrind',

diff --git a/cassandane/Cassandane/Test/MessageStoreFactory.pm b/cassandane/Cassandane/Test/MessageStoreFactory.pm
@@ -91,28 +91,28 @@ sub test_uri
     $self->assert(ref $ms eq 'Cassandane::MaildirMessageStore');
     $self->assert($ms->{directory} eq '/foo/bar');
 
-    $ms = Cassandane::MessageStoreFactory->create(uri => 'imap://victoria:secret@foo.com:9143/inbox.foo');
+    $ms = Cassandane::MessageStoreFactory->create(uri => 'imap://victoria:secret@foo.com:29143/inbox.foo');
     $self->assert(ref $ms eq 'Cassandane::IMAPMessageStore');
     $self->assert($ms->{username} eq 'victoria');
     $self->assert($ms->{password} eq 'secret');
     $self->assert($ms->{host} eq 'foo.com');
-    $self->assert($ms->{port} == 9143);
+    $self->assert($ms->{port} == 29143);
     $self->assert($ms->{folder} eq 'inbox.foo');
 
-    $ms = Cassandane::MessageStoreFactory->create(uri => 'imap://victoria@foo.com:9143/inbox.foo');
+    $ms = Cassandane::MessageStoreFactory->create(uri => 'imap://victoria@foo.com:29143/inbox.foo');
     $self->assert(ref $ms eq 'Cassandane::IMAPMessageStore');
     $self->assert($ms->{username} eq 'victoria');
     $self->assert(!defined $ms->{password});
     $self->assert($ms->{host} eq 'foo.com');
-    $self->assert($ms->{port} == 9143);
+    $self->assert($ms->{port} == 29143);
     $self->assert($ms->{folder} eq 'inbox.foo');
 
-    $ms = Cassandane::MessageStoreFactory->create(uri => 'imap://foo.com:9143/inbox.foo');
+    $ms = Cassandane::MessageStoreFactory->create(uri => 'imap://foo.com:29143/inbox.foo');
     $self->assert(ref $ms eq 'Cassandane::IMAPMessageStore');
     $self->assert(!defined $ms->{username});
     $self->assert(!defined $ms->{password});
     $self->assert($ms->{host} eq 'foo.com');
-    $self->assert($ms->{port} == 9143);
+    $self->assert($ms->{port} == 29143);
     $self->assert($ms->{folder} eq 'inbox.foo');
 
     $ms = Cassandane::MessageStoreFactory->create(uri => 'imap://foo.com/inbox.foo');

diff --git a/cassandane/cassandane.ini.example b/cassandane/cassandane.ini.example
@@ -83,7 +83,7 @@
 ##maxworkers = 1
 # Base port number to use.  All Cyrus instances run by Cassandane
 # will listen at ports starting from this number.
-##base_port = 9100
+##base_port = 29100
 # A list of tests or suites which will be suppressed.  These tests
 # will still run if requested on the command line, but will not be
 # run by default.

diff --git a/cassandane/genmail3.pl b/cassandane/genmail3.pl
@@ -63,7 +63,7 @@ sub usage
 my %params = (
         type => 'imap',
         host => 'localhost',
-        port => 9100,
+        port => 29100,
         folder => 'inbox',
         username => 'cassandane',
         password => 'testpw',

diff --git a/cassandane/imap-append.pl b/cassandane/imap-append.pl
@@ -56,7 +56,7 @@ sub usage
 my %imap_params = (
         type => 'imap',
         host => 'localhost',
-        port => 9100,
+        port => 29100,
         folder => 'inbox',
         username => 'cassandane',
         password => 'testpw',