trim

Author: julienrbrt

tests/systemtests/export_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"testing"
 
@@ -17,6 +18,25 @@ import (
 	systest "cosmossdk.io/systemtests"
 )
 
+// PebbleDB logs are printed directly to stderr.
+// Cosmos-DB and Store/v2 do not provide a way to override the logger.
+// This isn't problematic in a real-world scenario, but it makes it hard to test the output.
+// https://github.com/cockroachdb/pebble/blob/v1.1.2/internal/base/logger.go#L26-L40
+func trimPebbleDBStdErr(input string) string {
+	re := regexp.MustCompile(`^\[JOB \d+\] WAL .+ stopped reading at offset: .+; replayed \d+ keys in \d+ batches$`)
+
+	lines := strings.Split(input, "\n")
+	// filter out lines that match the regex
+	var filtered []string
+	for _, line := range lines {
+		if !re.MatchString(line) {
+			filtered = append(filtered, line)
+		}
+	}
+
+	return strings.Join(filtered, "\n")
+}
+
 func TestChainExportImport(t *testing.T) {
 	// Scenario:
 	//   given: a state dump from a running chain
@@ -69,12 +89,7 @@ func TestExportCmd_WithHeight(t *testing.T) {
 
 	for _, tc := range testCases {
 		res := cli.RunCommandWithArgs(tc.args...)
-		// sometimes the output contains some logs, so we need to extract the json part
-		if i := strings.Index(res, "{"); i > 0 {
-			res = res[i:]
-		}
-
-		height := gjson.Get(res, "initial_height").Int()
+		height := gjson.Get(trimPebbleDBStdErr(res), "initial_height").Int()
 		if tc.expZeroHeight {
 			require.Equal(t, height, int64(0))
 		} else {

tests/systemtests/snapshots_test.go

@@ -42,7 +42,7 @@ func TestSnapshots(t *testing.T) {
 
 	// Check snapshots list
 	res = cli.RunCommandWithArgs(command, "list", fmt.Sprintf("--home=%s", node0Dir))
-	require.Contains(t, res, "height: 5")
+	require.Contains(t, trimPebbleDBStdErr(res), "height: 5")
 
 	// Dump snapshot
 	res = cli.RunCommandWithArgs(command, "dump", "5", "3", fmt.Sprintf("--home=%s", node0Dir), fmt.Sprintf("--output=%s/5-3.tar.gz", node0Dir))