From c8c15236830412255e41de7435908fe90cd3e6b7 Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sun, 25 Aug 2024 16:04:55 -0700 Subject: [PATCH] Update test goldens + drop duplicate macos version from go tests --- .github/workflows/go-test.yml | 2 +- client/hctx/hctx.go | 2 +- client/lib/lib.go | 4 ---- client/testdata/TestTui-ColoredOutput-darwin-23 | 4 ++-- client/testdata/TestTui-ColoredOutput-linux-actions | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index e919f9f..4ca572b 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -24,7 +24,7 @@ jobs: needs: extra-delay strategy: matrix: - os: [ubuntu-latest, macos-latest, macos-14] + os: [ubuntu-latest, macos-14] test_shard: ["0", "1", "2", "3", "4"] fail-fast: false steps: diff --git a/client/hctx/hctx.go b/client/hctx/hctx.go index 931fba1..9d0e36e 100644 --- a/client/hctx/hctx.go +++ b/client/hctx/hctx.go @@ -274,7 +274,7 @@ func GetConfig() (ClientConfig, error) { return ClientConfig{}, fmt.Errorf("failed to parse config file: %w", err) } config.KeyBindings = config.KeyBindings.WithDefaults() - if config.DisplayedColumns == nil || len(config.DisplayedColumns) == 0 { + if len(config.DisplayedColumns) == 0 { config.DisplayedColumns = []string{"Hostname", "CWD", "Timestamp", "Runtime", "Exit Code", "Command"} } if config.TimestampFormat == "" { diff --git a/client/lib/lib.go b/client/lib/lib.go index 6d477ac..9390b0a 100644 --- a/client/lib/lib.go +++ b/client/lib/lib.go @@ -393,7 +393,6 @@ func concatIterators(iters ...iter.Seq2[string, error]) iter.Seq2[string, error] for _, seq := range iters { seq(yield) } - return } } @@ -406,7 +405,6 @@ func Values[Slice ~[]Elem, Elem any](s Slice) iter.Seq2[Elem, error] { return } } - return } } @@ -436,8 +434,6 @@ func readFileToIterator(path string) iter.Seq2[string, error] { yield("", fmt.Errorf("scanner.Err()=%w", err)) return } - - return } } diff --git a/client/testdata/TestTui-ColoredOutput-darwin-23 b/client/testdata/TestTui-ColoredOutput-darwin-23 index cc84625..897a7fc 100644 --- a/client/testdata/TestTui-ColoredOutput-darwin-23 +++ b/client/testdata/TestTui-ColoredOutput-darwin-23 @@ -1,6 +1,6 @@ -Search Query: > ls +Search Query: > ls -┌────────────────────────────────────────────────────────────────────────────────────────────────────────┐ +┌────────────────────────────────────────────────────────────────────────────────────────────────────────┐ │ Hostname CWD Timestamp Runtime Exit Code Command │ │────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ localhost /tmp/ Oct 17 2022 21:43:21 PDT 3s 2 echo 'aaaaaa bbbb' │ diff --git a/client/testdata/TestTui-ColoredOutput-linux-actions b/client/testdata/TestTui-ColoredOutput-linux-actions index 285ff8f..3730245 100644 --- a/client/testdata/TestTui-ColoredOutput-linux-actions +++ b/client/testdata/TestTui-ColoredOutput-linux-actions @@ -1,6 +1,6 @@ -Search Query: > ls +Search Query: > ls -┌────────────────────────────────────────────────────────────────────────────────────────────────────────┐ +┌────────────────────────────────────────────────────────────────────────────────────────────────────────┐ │ Hostname CWD Timestamp Runtime Exit Code Command │ │────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ localhost /tmp/ Oct 17 2022 21:43:21 PDT 3s 2 echo 'aaaaaa bbbb' │