Fix a race in pkg/integration.TestChannelBufferTimeout Upstream-commit: 53e2deb1590c8d0b6bf7c700c630dc432ea772d4 Component: engine