diff options
| author | Martin Polden <mpolden@mpolden.no> | 2024-04-02 09:55:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-02 09:55:40 +0200 |
| commit | 8e74a5cd954fec924f844ce2abeeb55181dbc9e5 (patch) | |
| tree | 776f966d1de05fdee9eab40b102d7ddd68f8bb42 | |
| parent | bc79caf0b639bc451c4630d49f6d9ac2a53dcc39 (diff) | |
| parent | a7a90cc5c4743e6f400000a1b21c8abba1308c83 (diff) | |
Merge pull request #30774 from vespa-engine/mpolden/skip-separator
Do not add whitespace between tokens
| -rw-r--r-- | client/go/internal/cli/cmd/query.go | 4 | ||||
| -rw-r--r-- | client/go/internal/cli/cmd/query_test.go | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/client/go/internal/cli/cmd/query.go b/client/go/internal/cli/cmd/query.go index 879c19c78a7..db6dfa0a158 100644 --- a/client/go/internal/cli/cmd/query.go +++ b/client/go/internal/cli/cmd/query.go @@ -175,9 +175,7 @@ func printResponseBody(body io.Reader, options printOptions, cli *CLI) error { return err } if event.Name == "token" { - if writingLine { - fmt.Fprint(cli.Stdout, " ") - } else { + if !writingLine { writingLine = true } var token struct { diff --git a/client/go/internal/cli/cmd/query_test.go b/client/go/internal/cli/cmd/query_test.go index af0ae1763e9..f5b113b6acb 100644 --- a/client/go/internal/cli/cmd/query_test.go +++ b/client/go/internal/cli/cmd/query_test.go @@ -10,7 +10,6 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "github.com/vespa-engine/vespa/client/go/internal/mock" ) @@ -106,10 +105,10 @@ event: token data: {"token": "The"} event: token -data: {"token": "Manhattan"} +data: {"token": " Manhattan"} event: token -data: {"token": "Project"} +data: {"token": " Project"} event: end ` @@ -121,7 +120,7 @@ event: token data: {"token": "The"} event: token -data: Manhattan +data: Manhattan event: error data: {"message": "something went wrong"} @@ -177,8 +176,7 @@ func assertQuery(t *testing.T, expectedQuery string, query ...string) { "{\n \"query\": \"result\"\n}\n", stdout.String(), "query output") - queryURL, err := queryServiceURL(client) - require.Nil(t, err) + queryURL := "http://127.0.0.1:8080" assert.Equal(t, queryURL+"/search/"+expectedQuery, client.LastRequest.URL.String()) } @@ -205,7 +203,3 @@ func assertQueryServiceError(t *testing.T, status int, errorMessage string) { stderr.String(), "error output") } - -func queryServiceURL(client *mock.HTTPClient) (string, error) { - return "http://127.0.0.1:8080", nil -} |