Merge branch 'master' into master

tests/integration/framework/tee/writecloser.go

@@ -44,18 +44,16 @@ func (w *writecloser) Write(p []byte) (n int, err error) {
 
 	for _, writer := range w.writers {
 		var n int
-		for {
-			written, err := writer.Write(p)
-			if err != nil {
+		for n < len(p) {
+			written, err := writer.Write(p[n:])
+			// If an error occurs and no bytes were written, add the error to the list of errors and break.
+			// If any bytes were written, continue writing until all bytes are written.
+			if err != nil && written == 0 {
 				errs = append(errs, err)
 				break
 			}
 
-			// Keep writing until all bytes are written to this writer.
 			n += written
-			if n == len(p) {
-				break
-			}
 		}
 	}
 

tests/integration/framework/tee/writecloser_test.go

@@ -133,6 +133,7 @@ func TestWriteCloser(t *testing.T) {
 		default:
 		}
 
+		// Writes are sequential, so the write to pw2 should block until the first read is complete.
 		assert.Nil(t, pr2resp.Load())
 
 		resp = make([]byte, 1024)
@@ -149,15 +150,15 @@ func TestWriteCloser(t *testing.T) {
 			require.Fail(t, "timeout waiting for write to complete")
 		}
 
-		value := pr2resp.Load()
-		assert.NotNil(t, value)
+		require.EventuallyWithT(t, func(c *assert.CollectT) {
+			value := pr2resp.Load()
+			assert.NotNil(c, value)
 
-		strValue, ok := value.(string)
-		assert.True(t, ok)
-
-		if ok {
-			assert.Equal(t, "helloworld", strValue[:10])
-		}
+			strValue, ok := value.(string)
+			if assert.True(c, ok) {
+				assert.Equal(c, "helloworld", strValue[:10])
+			}
+		}, time.Second, 10*time.Millisecond)
 
 		require.NoError(t, w.Close())
 		n, err = pr1.Read(resp)