integration: add runCmd and randomString utils

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

util/testutil/integration/util.go

@@ -3,6 +3,7 @@ package integration
 import (
 	"bytes"
 	"context"
+	"crypto/rand"
 	"fmt"
 	"io"
 	"net"
@@ -20,17 +21,20 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
+func runCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) error {
+	if logs != nil {
+		setCmdLogs(cmd, logs)
+	}
+	fmt.Fprintf(cmd.Stderr, "> runCmd %v %+v\n", time.Now(), cmd.String())
+	return cmd.Run()
+}
+
 func startCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) (func() error, error) {
 	if logs != nil {
-		b := new(bytes.Buffer)
-		logs["stdout: "+cmd.Path] = b
-		cmd.Stdout = &lockingWriter{Writer: b}
-		b = new(bytes.Buffer)
-		logs["stderr: "+cmd.Path] = b
-		cmd.Stderr = &lockingWriter{Writer: b}
+		setCmdLogs(cmd, logs)
 	}
 
-	fmt.Fprintf(cmd.Stderr, "> startCmd %v %+v\n", time.Now(), cmd.Args)
+	fmt.Fprintf(cmd.Stderr, "> startCmd %v %+v\n", time.Now(), cmd.String())
 
 	if err := cmd.Start(); err != nil {
 		return nil, err
@@ -75,6 +79,15 @@ func startCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) (func() error, error
 	}, nil
 }
 
+func setCmdLogs(cmd *exec.Cmd, logs map[string]*bytes.Buffer) {
+	b := new(bytes.Buffer)
+	logs["stdout: "+cmd.String()] = b
+	cmd.Stdout = &lockingWriter{Writer: b}
+	b = new(bytes.Buffer)
+	logs["stderr: "+cmd.String()] = b
+	cmd.Stderr = &lockingWriter{Writer: b}
+}
+
 func waitUnix(address string, d time.Duration) error {
 	address = strings.TrimPrefix(address, "unix://")
 	addr, err := net.ResolveUnixAddr("unix", address)
@@ -167,3 +180,13 @@ func Tmpdir(t *testing.T, appliers ...fstest.Applier) (string, error) {
 	}
 	return tmpdir, nil
 }
+
+func randomString(n int) string {
+	chars := "abcdefghijklmnopqrstuvwxyz"
+	var b = make([]byte, n)
+	_, _ = rand.Read(b)
+	for k, v := range b {
+		b[k] = chars[v%byte(len(chars))]
+	}
+	return string(b)
+}