Merge pull request #1482 from smallstep/fix-reload-tests

maraino · web-flow · commit d604a900ed09 · 2023-07-19T15:03:52.000-07:00
Wait for Accept in TestBootstrapClientServerRotation
diff --git a/ca/bootstrap_test.go b/ca/bootstrap_test.go
@@ -606,7 +606,13 @@ func doReload(ca *CA) error {
 	}
 	// Use same address in new server
 	newCA.srv.Addr = ca.srv.Addr
-	return ca.srv.Reload(newCA.srv)
+	if err := ca.srv.Reload(newCA.srv); err != nil {
+		return err
+	}
+
+	// Wait a few ms until the http server calls listener.Accept()
+	time.Sleep(100 * time.Millisecond)
+	return nil
 }
 
 func TestBootstrapListener(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,13 @@ func doReload(ca *CA) error {`
`606`	`606`	`}`
`607`	`607`	`// Use same address in new server`
`608`	`608`	`newCA.srv.Addr = ca.srv.Addr`
`609`		`- return ca.srv.Reload(newCA.srv)`
	`609`	`+ if err := ca.srv.Reload(newCA.srv); err != nil {`
	`610`	`+ return err`
	`611`	`+ }`
	`612`	`+`
	`613`	`+ // Wait a few ms until the http server calls listener.Accept()`
	`614`	`+ time.Sleep(100 * time.Millisecond)`
	`615`	`+ return nil`
`610`	`616`	`}`
`611`	`617`
`612`	`618`	`func TestBootstrapListener(t *testing.T) {`