p2p: return increased timeout

p2p/server.go

@@ -445,7 +445,18 @@ func (srv *Server) Stop() {
 	}
 	close(srv.quit)
 	srv.lock.Unlock()
-	srv.loopWG.Wait()
+
+	stopChan := make(chan struct{})
+	go func() {
+		srv.loopWG.Wait()
+		close(stopChan)
+	}()
+
+	select {
+	case <-stopChan:
+	case <-time.After(defaultDialTimeout): // we should use defaultDialTimeout as we can dial just before the shutdown
+		srv.log.Warn("stop p2p server timeout, forcing stop")
+	}
 }
 
 // sharedUDPConn implements a shared connection. Write sends messages to the underlying connection while read returns

p2p/server_test.go

@@ -223,8 +223,8 @@ func TestServerStopTimeout(t *testing.T) {
 
 	select {
 	case <-stopChan:
-	case <-time.After(10 * time.Second):
-		t.Error("server should be shutdown in 10 seconds")
+	case <-time.After(defaultDialTimeout + 1*time.Second):
+		t.Error("server should be shutdown in defaultDialTimeout + 1 seconds")
 	}
 }