Migrate bench to a cobra style command

cmd/bbolt/command_bench_test.go

@@ -0,0 +1,52 @@
+package main_test
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"strings"
+	"testing"
+
+	main "go.etcd.io/bbolt/cmd/bbolt"
+)
+
+// Ensure the "bench" command runs and exits without errors
+func TestBenchCommand_Run(t *testing.T) {
+	tests := map[string]struct {
+		args []string
+	}{
+		"no-args":    {},
+		"100k count": {[]string{"--count", "100000"}},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			// Run the command.
+			buf := new(bytes.Buffer)
+			rootCmd := main.NewRootCommand()
+			rootCmd.SetArgs(append([]string{"bench"}, test.args...))
+			rootCmd.SetOut(buf)
+			if err := rootCmd.Execute(); err != nil {
+				t.Fatal(err)
+			}
+
+			output, err := io.ReadAll(buf)
+			if err != nil {
+				t.Fatal(err)
+			}
+			stderr := string(output)
+
+			if !strings.Contains(stderr, "starting write benchmark.") || !strings.Contains(stderr, "starting read benchmark.") {
+				t.Fatal(fmt.Errorf("benchmark result does not contain read/write start output:\n%s", stderr))
+			}
+
+			if strings.Contains(stderr, "iter mismatch") {
+				t.Fatal(fmt.Errorf("found iter mismatch in stdout:\n%s", stderr))
+			}
+
+			if !strings.Contains(stderr, "# Write") || !strings.Contains(stderr, "# Read") {
+				t.Fatal(fmt.Errorf("benchmark result does not contain read/write output:\n%s", stderr))
+			}
+		})
+	}
+}

cmd/bbolt/command_root.go

@@ -20,6 +20,7 @@ func NewRootCommand() *cobra.Command {
 		newVersionCobraCommand(),
 		newSurgeryCobraCommand(),
 		newInspectCobraCommand(),
+		newBenchCobraCommand(),
 	)
 
 	return rootCmd

cmd/bbolt/main_test.go

@@ -479,40 +479,6 @@ func TestPagesCommand_Run(t *testing.T) {
 	require.NoError(t, err)
 }
 
-// Ensure the "bench" command runs and exits without errors
-func TestBenchCommand_Run(t *testing.T) {
-	tests := map[string]struct {
-		args []string
-	}{
-		"no-args":    {},
-		"100k count": {[]string{"-count", "100000"}},
-	}
-
-	for name, test := range tests {
-		t.Run(name, func(t *testing.T) {
-			// Run the command.
-			m := NewMain()
-			args := append([]string{"bench"}, test.args...)
-			if err := m.Run(args...); err != nil {
-				t.Fatal(err)
-			}
-
-			stderr := m.Stderr.String()
-			if !strings.Contains(stderr, "starting write benchmark.") || !strings.Contains(stderr, "starting read benchmark.") {
-				t.Fatal(fmt.Errorf("benchmark result does not contain read/write start output:\n%s", stderr))
-			}
-
-			if strings.Contains(stderr, "iter mismatch") {
-				t.Fatal(fmt.Errorf("found iter mismatch in stdout:\n%s", stderr))
-			}
-
-			if !strings.Contains(stderr, "# Write") || !strings.Contains(stderr, "# Read") {
-				t.Fatal(fmt.Errorf("benchmark result does not contain read/write output:\n%s", stderr))
-			}
-		})
-	}
-}
-
 type ConcurrentBuffer struct {
 	m   sync.Mutex
 	buf bytes.Buffer

tests/robustness/powerfailure_test.go

@@ -90,11 +90,11 @@ func doPowerFailure(t *testing.T, du time.Duration, fsMountOpt string, useFailpo
 	dbPath := filepath.Join(root, "boltdb")
 
 	args := []string{"bbolt", "bench",
-		"-work", // keep the database
-		"-path", dbPath,
-		"-count=1000000000",
-		"-batch-size=5", // separate total count into multiple truncation
-		"-value-size=512",
+		"--work", // keep the database
+		"--path", dbPath,
+		"--count=1000000000",
+		"--batch-size=5", // separate total count into multiple truncation
+		"--value-size=512",
 	}
 
 	logPath := filepath.Join(t.TempDir(), fmt.Sprintf("%s.log", t.Name()))