Merge pull request #4999 from gyuho/test

*: log, expect by capability check

e2e/ctl_v2_test.go

@@ -169,10 +169,6 @@ func testCtlV2GetRoleUser(t *testing.T, cfg *etcdProcessClusterConfig) {
 		}
 	}()
 
-	// wait for the server capabilities to be updated based on the version;
-	// the update loop has a delay of 500ms, so 1s should be enough wait time
-	time.Sleep(time.Second)
-
 	if err := etcdctlRoleAdd(epc, "foo"); err != nil {
 		t.Fatalf("failed to add role (%v)", err)
 	}

e2e/etcd_test.go

@@ -252,7 +252,7 @@ func newEtcdProcessCluster(cfg *etcdProcessClusterConfig) (*etcdProcessCluster,
 
 	// wait for cluster to start
 	readyC := make(chan error, cfg.clusterSize+cfg.proxySize)
-	readyStr := "membership: set the initial cluster version to"
+	readyStr := "enabled capabilities for version"
 	for i := range etcdCfgs {
 		go func(etcdp *etcdProcess) {
 			rs := readyStr

etcdserver/api/v2http/capability.go

@@ -63,6 +63,7 @@ func capabilityLoop(s *etcdserver.EtcdServer) {
 			enableMapMu.Lock()
 			enabledMap = capabilityMaps[pv.String()]
 			enableMapMu.Unlock()
+			plog.Infof("enabled capabilities for version %s", pv)
 		}
 
 		select {