Fix test

services/client_info/client_info.go

@@ -71,6 +71,11 @@ func (self *ClientInfoManager) ListClients(ctx context.Context) <-chan string {
 		defer close(output_chan)
 
 		for _, key := range self.storage.Keys() {
+			// Ignore the server - it is not a real client.
+			if key == "server" {
+				continue
+			}
+
 			select {
 			case <-ctx.Done():
 				return

services/launcher/launcher_test.go

@@ -1381,7 +1381,7 @@ func (self *LauncherTestSuite) TestDelete() {
 	// However GetFlows omits the deleted flow immediately because it
 	// can not find it (The actual flow object is removed but the
 	// index is out of step).
-	vtesting.WaitUntil(5*time.Second, self.T(), func() bool {
+	vtesting.WaitUntil(10*time.Second, self.T(), func() bool {
 		res, err = launcher.GetFlows(self.Ctx, self.ConfigObj, "server",
 			result_sets.ResultSetOptions{}, 0, 10)
 		assert.NoError(self.T(), err)