diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-11-26 16:36:12 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-11-26 16:36:12 +0100 |
commit | ccc898d22d06d63197f3fc31748c83e4cd9ff3d4 (patch) | |
tree | bd360b22a88a14bf2c9228fca026d43ba3ce74b7 /client | |
parent | e8f12e10cd27603335357cf5d0bb33528d2f16d6 (diff) |
Fix newlines
Diffstat (limited to 'client')
-rw-r--r-- | client/go/cmd/test.go | 9 | ||||
-rw-r--r-- | client/go/cmd/test_test.go | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/client/go/cmd/test.go b/client/go/cmd/test.go index 8435cf482e4..7c49703595e 100644 --- a/client/go/cmd/test.go +++ b/client/go/cmd/test.go @@ -122,10 +122,12 @@ func runTest(testPath string, target vespa.Target, dryRun bool) string { defaultParameters, err := getParameters(test.Defaults.ParametersRaw, path.Dir(testPath)) if err != nil { + fmt.Fprintln(stderr) fatalErrHint(err, fmt.Sprintf("Invalid default parameters for %s", testName), "See https://cloud.vespa.ai/en/reference/testing") } if len(test.Steps) == 0 { + fmt.Fprintln(stderr) fatalErrHint(fmt.Errorf("a test must have at least one step, but none were found in %s", testPath), "See https://cloud.vespa.ai/en/reference/testing") } for i, step := range test.Steps { @@ -135,7 +137,8 @@ func runTest(testPath string, target vespa.Target, dryRun bool) string { } failure, longFailure, err := verify(step, path.Dir(testPath), test.Defaults.Cluster, defaultParameters, target, dryRun) if err != nil { - fatalErr(err, fmt.Sprintf("Error in %s", stepName), "See https://cloud.vespa.ai/en/reference/testing") + fmt.Fprintln(stderr) + fatalErrHint(err, fmt.Sprintf("Error in %s", stepName), "See https://cloud.vespa.ai/en/reference/testing") } if !dryRun { if failure != "" { @@ -368,7 +371,7 @@ func getParameters(parametersRaw []byte, testsPath string) (map[string]string, e resolvedParametersPath := path.Join(testsPath, parametersPath) parametersRaw, err = ioutil.ReadFile(resolvedParametersPath) if err != nil { - fatalErrHint(err, fmt.Sprintf("Failed to read request parameters file at '%s'", resolvedParametersPath), "See https://cloud.vespa.ai/en/reference/testing") + return nil, fmt.Errorf("failed to read request parameters at %s: %w", resolvedParametersPath, err) } } var parameters map[string]string @@ -386,7 +389,7 @@ func getBody(bodyRaw []byte, testsPath string) ([]byte, error) { resolvedBodyPath := path.Join(testsPath, bodyPath) bodyRaw, err = ioutil.ReadFile(resolvedBodyPath) if err != nil { - fatalErrHint(err, fmt.Sprintf("Failed to read body file at '%s'", resolvedBodyPath), "See https://cloud.vespa.ai/en/reference/testing") + return nil, fmt.Errorf("failed to read body file at %s: %w", resolvedBodyPath, err) } } return bodyRaw, nil diff --git a/client/go/cmd/test_test.go b/client/go/cmd/test_test.go index 1e2805e3229..9a566beb10f 100644 --- a/client/go/cmd/test_test.go +++ b/client/go/cmd/test_test.go @@ -53,7 +53,7 @@ func TestProductionTest(t *testing.T) { func TestTestWithoutAssertions(t *testing.T) { client := &mockHttpClient{} _, errBytes := execute(command{args: []string{"test", "testdata/tests/system-test/foo/query.json"}}, t, client) - assert.Equal(t, "Error: a test must have at least one step, but none were found in testdata/tests/system-test/foo/query.json\nHint: See https://cloud.vespa.ai/en/reference/testing\n", errBytes) + assert.Equal(t, "\nError: a test must have at least one step, but none were found in testdata/tests/system-test/foo/query.json\nHint: See https://cloud.vespa.ai/en/reference/testing\n", errBytes) } func TestSuiteWithoutTests(t *testing.T) { |