Skip to content

Commit 2eab5b0

Browse files
nirrozenbaumnirrozenbaum
committed
[FAB-9100] fix ports to allow parallel unit-tests
Change-Id: Ifeb2e5b8350af506411b23d42e891d6f91478989 Signed-off-by: nirro <nirro@il.ibm.com>
1 parent fbe0d88 commit 2eab5b0

9 files changed

+80
-80
lines changed

‎gossip/comm/comm_test.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ func TestHandshake(t *testing.T) {
331331

332332
func TestBasic(t *testing.T) {
333333
t.Parallel()
334-
comm1, _ := newCommInstance(52000, naiveSec)
335-
comm2, _ := newCommInstance(53000, naiveSec)
334+
comm1, _ := newCommInstance(2000, naiveSec)
335+
comm2, _ := newCommInstance(3000, naiveSec)
336336
comm1.(*commImpl).SetDialOpts()
337337
comm2.(*commImpl).SetDialOpts()
338338
defer comm1.Stop()
@@ -346,25 +346,25 @@ func TestBasic(t *testing.T) {
346346
}
347347
go reader(m1)
348348
go reader(m2)
349-
comm1.Send(createGossipMsg(), remotePeer(53000))
349+
comm1.Send(createGossipMsg(), remotePeer(3000))
350350
time.Sleep(time.Second)
351-
comm2.Send(createGossipMsg(), remotePeer(52000))
351+
comm2.Send(createGossipMsg(), remotePeer(2000))
352352
waitForMessages(t, out, 2, "Didn't receive 2 messages")
353353
}
354354

355355
func TestProdConstructor(t *testing.T) {
356356
t.Parallel()
357-
srv, lsnr, dialOpts, certs := createGRPCLayer(29000)
357+
srv, lsnr, dialOpts, certs := createGRPCLayer(20000)
358358
defer srv.Stop()
359359
defer lsnr.Close()
360-
id := []byte("localhost:29000")
360+
id := []byte("localhost:20000")
361361
comm1, _ := NewCommInstance(srv, certs, identity.NewIdentityMapper(naiveSec, id, noopPurgeIdentity, naiveSec), id, dialOpts)
362362
go srv.Serve(lsnr)
363363

364-
srv, lsnr, dialOpts, certs = createGRPCLayer(39000)
364+
srv, lsnr, dialOpts, certs = createGRPCLayer(30000)
365365
defer srv.Stop()
366366
defer lsnr.Close()
367-
id = []byte("localhost:39000")
367+
id = []byte("localhost:30000")
368368
comm2, _ := NewCommInstance(srv, certs, identity.NewIdentityMapper(naiveSec, id, noopPurgeIdentity, naiveSec), id, dialOpts)
369369
go srv.Serve(lsnr)
370370
defer comm1.Stop()
@@ -378,9 +378,9 @@ func TestProdConstructor(t *testing.T) {
378378
}
379379
go reader(m1)
380380
go reader(m2)
381-
comm1.Send(createGossipMsg(), remotePeer(39000))
381+
comm1.Send(createGossipMsg(), remotePeer(30000))
382382
time.Sleep(time.Second)
383-
comm2.Send(createGossipMsg(), remotePeer(29000))
383+
comm2.Send(createGossipMsg(), remotePeer(20000))
384384
waitForMessages(t, out, 2, "Didn't receive 2 messages")
385385
}
386386

@@ -549,8 +549,8 @@ func TestNonResponsivePing(t *testing.T) {
549549

550550
func TestResponses(t *testing.T) {
551551
t.Parallel()
552-
comm1, _ := newCommInstance(58611, naiveSec)
553-
comm2, _ := newCommInstance(58612, naiveSec)
552+
comm1, _ := newCommInstance(8611, naiveSec)
553+
comm2, _ := newCommInstance(8612, naiveSec)
554554

555555
defer comm1.Stop()
556556
defer comm2.Stop()
@@ -573,7 +573,7 @@ func TestResponses(t *testing.T) {
573573

574574
ticker := time.NewTicker(10 * time.Second)
575575
wg.Wait()
576-
comm2.Send(msg, remotePeer(58611))
576+
comm2.Send(msg, remotePeer(8611))
577577

578578
select {
579579
case <-ticker.C:
@@ -588,8 +588,8 @@ func TestResponses(t *testing.T) {
588588

589589
func TestAccept(t *testing.T) {
590590
t.Parallel()
591-
comm1, _ := newCommInstance(57611, naiveSec)
592-
comm2, _ := newCommInstance(57612, naiveSec)
591+
comm1, _ := newCommInstance(7611, naiveSec)
592+
comm2, _ := newCommInstance(7612, naiveSec)
593593

594594
evenNONCESelector := func(m interface{}) bool {
595595
return m.(proto.ReceivedMessage).GetGossipMessage().Nonce%2 == 0
@@ -620,7 +620,7 @@ func TestAccept(t *testing.T) {
620620
go readIntoSlice(&oddResults, oddNONCES)
621621

622622
for i := 0; i < util.GetIntOrDefault("peer.gossip.recvBuffSize", defRecvBuffSize); i++ {
623-
comm2.Send(createGossipMsg(), remotePeer(57611))
623+
comm2.Send(createGossipMsg(), remotePeer(7611))
624624
}
625625

626626
waitForMessages(t, out, util.GetIntOrDefault("peer.gossip.recvBuffSize", defRecvBuffSize), "Didn't receive all messages sent")
@@ -646,8 +646,8 @@ func TestAccept(t *testing.T) {
646646

647647
func TestReConnections(t *testing.T) {
648648
t.Parallel()
649-
comm1, _ := newCommInstance(43611, naiveSec)
650-
comm2, _ := newCommInstance(43612, naiveSec)
649+
comm1, _ := newCommInstance(3611, naiveSec)
650+
comm2, _ := newCommInstance(3612, naiveSec)
651651

652652
reader := func(out chan uint64, in <-chan proto.ReceivedMessage) {
653653
for {
@@ -666,19 +666,19 @@ func TestReConnections(t *testing.T) {
666666
go reader(out2, comm2.Accept(acceptAll))
667667

668668
// comm1 connects to comm2
669-
comm1.Send(createGossipMsg(), remotePeer(43612))
669+
comm1.Send(createGossipMsg(), remotePeer(3612))
670670
waitForMessages(t, out2, 1, "Comm2 didn't receive a message from comm1 in a timely manner")
671671
time.Sleep(time.Second)
672672
// comm2 sends to comm1
673-
comm2.Send(createGossipMsg(), remotePeer(43611))
673+
comm2.Send(createGossipMsg(), remotePeer(3611))
674674
waitForMessages(t, out1, 1, "Comm1 didn't receive a message from comm2 in a timely manner")
675675

676676
comm1.Stop()
677-
comm1, _ = newCommInstance(43611, naiveSec)
677+
comm1, _ = newCommInstance(3611, naiveSec)
678678
time.Sleep(time.Second)
679679
out1 = make(chan uint64, 1)
680680
go reader(out1, comm1.Accept(acceptAll))
681-
comm2.Send(createGossipMsg(), remotePeer(43611))
681+
comm2.Send(createGossipMsg(), remotePeer(3611))
682682
waitForMessages(t, out1, 1, "Comm1 didn't receive a message from comm2 in a timely manner")
683683
}
684684

@@ -725,14 +725,14 @@ func TestProbe(t *testing.T) {
725725

726726
func TestPresumedDead(t *testing.T) {
727727
t.Parallel()
728-
comm1, _ := newCommInstance(44611, naiveSec)
729-
comm2, _ := newCommInstance(44612, naiveSec)
728+
comm1, _ := newCommInstance(4611, naiveSec)
729+
comm2, _ := newCommInstance(4612, naiveSec)
730730

731731
wg := sync.WaitGroup{}
732732
wg.Add(1)
733733
go func() {
734734
wg.Wait()
735-
comm1.Send(createGossipMsg(), remotePeer(44612))
735+
comm1.Send(createGossipMsg(), remotePeer(4612))
736736
}()
737737

738738
ticker := time.NewTicker(time.Duration(10) * time.Second)
@@ -748,7 +748,7 @@ func TestPresumedDead(t *testing.T) {
748748
comm2.Stop()
749749
go func() {
750750
for i := 0; i < 5; i++ {
751-
comm1.Send(createGossipMsg(), remotePeer(44612))
751+
comm1.Send(createGossipMsg(), remotePeer(4612))
752752
time.Sleep(time.Millisecond * 200)
753753
}
754754
}()

‎gossip/comm/crypto_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func createTestServer(t *testing.T, cert *tls.Certificate) *gossipTestServer {
4141
InsecureSkipVerify: true,
4242
}
4343
s := grpc.NewServer(grpc.Creds(credentials.NewTLS(tlsConf)))
44-
ll, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "", 2030))
44+
ll, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "", 5611))
4545
assert.NoError(t, err, "%v", err)
4646

4747
srv := &gossipTestServer{s: s, ll: ll, selfCertHash: certHashFromRawCert(cert.Certificate[0])}
@@ -85,7 +85,7 @@ func TestCertificateExtraction(t *testing.T) {
8585
})
8686
ctx := context.Background()
8787
ctx, _ = context.WithTimeout(ctx, time.Second)
88-
conn, err := grpc.DialContext(ctx, "localhost:2030", grpc.WithTransportCredentials(ta), grpc.WithBlock())
88+
conn, err := grpc.DialContext(ctx, "localhost:5611", grpc.WithTransportCredentials(ta), grpc.WithBlock())
8989
assert.NoError(t, err, "%v", err)
9090

9191
cl := proto.NewGossipClient(conn)

‎gossip/discovery/discovery_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ func TestConnect(t *testing.T) {
427427
instances := []*gossipInstance{}
428428
firstSentMemReqMsgs := make(chan *proto.SignedGossipMessage, nodeNum)
429429
for i := 0; i < nodeNum; i++ {
430-
inst := createDiscoveryInstance(17611+i, fmt.Sprintf("d%d", i), []string{})
430+
inst := createDiscoveryInstance(7611+i, fmt.Sprintf("d%d", i), []string{})
431431

432432
inst.comm.lock.Lock()
433433
inst.comm.mock = &mock.Mock{}
@@ -447,7 +447,7 @@ func TestConnect(t *testing.T) {
447447

448448
instances = append(instances, inst)
449449
j := (i + 1) % 10
450-
endpoint := fmt.Sprintf("localhost:%d", 17611+j)
450+
endpoint := fmt.Sprintf("localhost:%d", 7611+j)
451451
netMember2Connect2 := NetworkMember{Endpoint: endpoint, PKIid: []byte(endpoint)}
452452
inst.Connect(netMember2Connect2, func() (identification *PeerIdentification, err error) {
453453
return &PeerIdentification{SelfOrg: false, ID: nil}, nil
@@ -479,18 +479,18 @@ func TestConnect(t *testing.T) {
479479
func TestUpdate(t *testing.T) {
480480
t.Parallel()
481481
nodeNum := 5
482-
bootPeers := []string{bootPeer(16611), bootPeer(16612)}
482+
bootPeers := []string{bootPeer(6611), bootPeer(6612)}
483483
instances := []*gossipInstance{}
484484

485-
inst := createDiscoveryInstance(16611, "d1", bootPeers)
485+
inst := createDiscoveryInstance(6611, "d1", bootPeers)
486486
instances = append(instances, inst)
487487

488-
inst = createDiscoveryInstance(16612, "d2", bootPeers)
488+
inst = createDiscoveryInstance(6612, "d2", bootPeers)
489489
instances = append(instances, inst)
490490

491491
for i := 3; i <= nodeNum; i++ {
492492
id := fmt.Sprintf("d%d", i)
493-
inst = createDiscoveryInstance(16610+i, id, bootPeers)
493+
inst = createDiscoveryInstance(6610+i, id, bootPeers)
494494
instances = append(instances, inst)
495495
}
496496

@@ -501,7 +501,7 @@ func TestUpdate(t *testing.T) {
501501
waitUntilOrFail(t, fullMembership)
502502

503503
instances[0].UpdateMetadata([]byte("bla bla"))
504-
instances[nodeNum-1].UpdateEndpoint("localhost:15511")
504+
instances[nodeNum-1].UpdateEndpoint("localhost:5511")
505505

506506
checkMembership := func() bool {
507507
for _, member := range instances[nodeNum-1].GetMembership() {
@@ -514,7 +514,7 @@ func TestUpdate(t *testing.T) {
514514

515515
for _, member := range instances[0].GetMembership() {
516516
if string(member.PKIid) == instances[nodeNum-1].comm.id {
517-
if "localhost:15511" != string(member.Endpoint) {
517+
if "localhost:5511" != string(member.Endpoint) {
518518
return false
519519
}
520520
}
@@ -652,14 +652,14 @@ func TestGetFullMembership(t *testing.T) {
652652

653653
func TestGossipDiscoveryStopping(t *testing.T) {
654654
t.Parallel()
655-
inst := createDiscoveryInstance(19611, "d1", []string{bootPeer(19611)})
655+
inst := createDiscoveryInstance(9611, "d1", []string{bootPeer(9611)})
656656
time.Sleep(time.Second)
657657
waitUntilOrFailBlocking(t, inst.Stop)
658658
}
659659

660660
func TestGossipDiscoverySkipConnectingToLocalhostBootstrap(t *testing.T) {
661661
t.Parallel()
662-
inst := createDiscoveryInstance(11711, "d1", []string{"localhost:11711", "127.0.0.1:11711"})
662+
inst := createDiscoveryInstance(11611, "d1", []string{"localhost:11611", "127.0.0.1:11611"})
663663
inst.comm.lock.Lock()
664664
inst.comm.mock = &mock.Mock{}
665665
inst.comm.mock.On("SendToPeer", mock.Anything, mock.Anything).Run(func(mock.Arguments) {

0 commit comments

Comments
 (0)