[FAB-2672] Fix TestDisclosurePolicyWithPull

Sometimes the sleep in the test isn't enough so when a comparison
is being made, the peers do not have enough time to discover each other,
and the result is the actual membership is is a subset of the expected.

Change-Id: Ibbfffea42e29554401ba77a8a73c3fd8c6ffb794
Signed-off-by: Yacov Manevich <[email protected]>

Author: yacovm

gossip/discovery/discovery_test.go

@@ -605,7 +605,17 @@ func TestDisclosurePolicyWithPull(t *testing.T) {
 	// Sleep a while to let them establish membership. This time should be more than enough
 	// because the instances are configured to pull membership in very high frequency from
 	// up to 10 peers (which results in - pulling from everyone)
-	time.Sleep(time.Second * 5)
+	waitUntilOrFail(t, func() bool {
+		for _, inst := range append(instances1, instances2...) {
+			// Ensure the expected membership is equal in size to the actual membership
+			// of each peer.
+			portsOfKnownMembers := portsOfMembers(inst.GetMembership())
+			if len(peersThatShouldBeKnownToPeers[inst.port]) != len(portsOfKnownMembers) {
+				return false
+			}
+		}
+		return true
+	})
 	for _, inst := range append(instances1, instances2...) {
 		portsOfKnownMembers := portsOfMembers(inst.GetMembership())
 		// Ensure the expected membership is equal to the actual membership