gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-16 19:14:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1014 from nats-io/fix_flappers

Browse Source 
Fix flappers
This commit is contained in:
Ivan Kozlovic
2019-05-26 18:16:27 -06:00
committed by GitHub
parent 7e11b982aa ce1e6defab
commit a16a53441a
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/events_test.go
View File

@@ -497,9 +497,9 @@ func TestSystemAccountConnectionUpdatesStopAfterNoLocal(t *testing.T) {
nc.Close()
}
// Wait for all 4 notifications.
// Wait for the 4 new notifications, 8 total (4 for connect, 4 for disconnect)
checkFor(t, time.Second, 50*time.Millisecond, func() error {
if len(received) == 4 {
if len(received) == 8 {
return nil
}
return fmt.Errorf("Not enough messages, %d vs 4", len(received))

9
server/gateway_test.go
View File

@@ -39,6 +39,9 @@ func init() {
// Wait for the expected number of outbound gateways, or fails.
func waitForOutboundGateways(t *testing.T, s *Server, expected int, timeout time.Duration) {
t.Helper()
if timeout < 2*time.Second {
timeout = 2 * time.Second
}
checkFor(t, timeout, 15*time.Millisecond, func() error {
if n := s.numOutboundGateways(); n != expected {
return fmt.Errorf("Expected %v outbound gateway(s), got %v", expected, n)
@@ -50,6 +53,9 @@ func waitForOutboundGateways(t *testing.T, s *Server, expected int, timeout time
// Wait for the expected number of inbound gateways, or fails.
func waitForInboundGateways(t *testing.T, s *Server, expected int, timeout time.Duration) {
t.Helper()
if timeout < 2*time.Second {
timeout = 2 * time.Second
}
checkFor(t, timeout, 15*time.Millisecond, func() error {
if n := s.numInboundGateways(); n != expected {
return fmt.Errorf("Expected %v inbound gateway(s), got %v", expected, n)
@@ -2123,6 +2129,7 @@ func TestGatewaySendRemoteQSubs(t *testing.T) {
ob2 := testDefaultOptionsForGateway("B")
ob2.Routes = RoutesFromStr(fmt.Sprintf("nats://%s:%d", ob1.Cluster.Host, ob1.Cluster.Port))
sb2 := runGatewayServer(ob2)
defer sb2.Shutdown()
checkClusterFormed(t, sb1, sb2)
@@ -3128,7 +3135,7 @@ func TestGatewaySendAllSubsBadProtocol(t *testing.T) {
checkFor(t, 3*time.Second, 15*time.Millisecond, func() error {
c = getInboundGatewayConnection(sa, "A")
if c == nil {
t.Fatalf("Did not reconnect")
return fmt.Errorf("Did not reconnect")
}
return nil
})

1
server/monitor_test.go
View File

@@ -2427,6 +2427,7 @@ func TestMonitorGatewayURLsUpdated(t *testing.T) {
ob2 := testDefaultOptionsForGateway("B")
ob2.Routes = RoutesFromStr(fmt.Sprintf("nats://127.0.0.1:%d", sb1.ClusterAddr().Port))
sb2 := runGatewayServer(ob2)
defer sb2.Shutdown()
// Wait for sb1 and sb2 to connect
checkClusterFormed(t, sb1, sb2)

7
test/leafnode_test.go
View File

@@ -539,6 +539,9 @@ func shutdownCluster(c *cluster) {
// Wait for the expected number of outbound gateways, or fails.
func waitForOutboundGateways(t *testing.T, s *server.Server, expected int, timeout time.Duration) {
t.Helper()
if timeout < 2*time.Second {
timeout = 2 * time.Second
}
checkFor(t, timeout, 15*time.Millisecond, func() error {
if n := s.NumOutboundGateways(); n != expected {
return fmt.Errorf("Expected %v outbound gateway(s), got %v", expected, n)
@@ -1903,6 +1906,10 @@ func TestLeafNodeResetsMSGProto(t *testing.T) {
leafSend, leafExpect := setupConn(t, lc)
// To avoid possible INFO when switching to interest mode only,
// delay start of gateway.
time.Sleep(500 * time.Millisecond)
gw := createGatewayConn(t, opts.Gateway.Host, opts.Gateway.Port)
defer gw.Close()