Merge pull request #1066 from mreiferson/deflake-test-reconfigure

nsqd: deflake TestReconfigure

nsqd/nsqd.go

@@ -92,6 +92,8 @@ func New(opts *Options) *NSQD {
 	httpcli := http_api.NewClient(nil, opts.HTTPClientConnectTimeout, opts.HTTPClientRequestTimeout)
 	n.ci = clusterinfo.New(n.logf, httpcli)
 
+	n.lookupPeers.Store([]*lookupPeer{})
+
 	n.swapOpts(opts)
 	n.errValue.Store(errStore{})
 

nsqd/nsqd_test.go

@@ -368,32 +368,43 @@ func TestReconfigure(t *testing.T) {
 	defer os.RemoveAll(opts.DataPath)
 	defer nsqd.Exit()
 
-	time.Sleep(250 * time.Millisecond)
-
-	newOpts := *opts
+	newOpts := NewOptions()
+	newOpts.Logger = opts.Logger
 	newOpts.NSQLookupdTCPAddresses = []string{lookupd1.RealTCPAddr().String()}
-	nsqd.swapOpts(&newOpts)
+	nsqd.swapOpts(newOpts)
 	nsqd.triggerOptsNotification()
 	test.Equal(t, 1, len(nsqd.getOpts().NSQLookupdTCPAddresses))
 
-	time.Sleep(350 * time.Millisecond)
-
-	numLookupPeers := len(nsqd.lookupPeers.Load().([]*lookupPeer))
+	var numLookupPeers int
+	for i := 0; i < 100; i++ {
+		numLookupPeers = len(nsqd.lookupPeers.Load().([]*lookupPeer))
+		if numLookupPeers == 1 {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
 	test.Equal(t, 1, numLookupPeers)
 
-	newOpts = *opts
+	newOpts = NewOptions()
+	newOpts.Logger = opts.Logger
 	newOpts.NSQLookupdTCPAddresses = []string{lookupd2.RealTCPAddr().String(), lookupd3.RealTCPAddr().String()}
-	nsqd.swapOpts(&newOpts)
+	nsqd.swapOpts(newOpts)
 	nsqd.triggerOptsNotification()
 	test.Equal(t, 2, len(nsqd.getOpts().NSQLookupdTCPAddresses))
 
-	time.Sleep(350 * time.Millisecond)
+	for i := 0; i < 100; i++ {
+		numLookupPeers = len(nsqd.lookupPeers.Load().([]*lookupPeer))
+		if numLookupPeers == 2 {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	test.Equal(t, 2, numLookupPeers)
 
 	var lookupPeers []string
 	for _, lp := range nsqd.lookupPeers.Load().([]*lookupPeer) {
 		lookupPeers = append(lookupPeers, lp.addr)
 	}
-	test.Equal(t, 2, len(lookupPeers))
 	test.Equal(t, newOpts.NSQLookupdTCPAddresses, lookupPeers)
 }