OSS parts of sighup license reload test (#11816)

command/server.go

@@ -103,6 +103,7 @@ type ServerCommand struct {
 	reloadFuncs       *map[string][]reloadutil.ReloadFunc
 	startedCh         chan (struct{}) // for tests
 	reloadedCh        chan (struct{}) // for tests
+	licenseReloadedCh chan (error)    // for tests
 
 	allLoggers []log.Logger
 
@@ -1564,8 +1565,13 @@ func (c *ServerCommand) Run(args []string) int {
 			}
 
 			// Reload license file
-			if err := vault.LicenseReload(core); err != nil {
+			if err = vault.LicenseReload(core); err != nil {
-				c.UI.Error(fmt.Sprintf("Error reloading license: %v", err))
+				c.UI.Error(err.Error())
+			}
+
+			select {
+			case c.licenseReloadedCh <- err:
+			default:
 			}
 
 		case <-c.SigUSR2Ch:

command/server_test.go

@@ -98,6 +98,7 @@ func testServerCommand(tb testing.TB) (*cli.MockUi, *ServerCommand) {
 		// These prevent us from random sleep guessing...
 		startedCh:         make(chan struct{}, 5),
 		reloadedCh:        make(chan struct{}, 5),
+		licenseReloadedCh: make(chan error),
 	}
 }