From 0b4590b237c83beb1ac63df3b81ce90b39edcd10 Mon Sep 17 00:00:00 2001 From: Andrew Keesler Date: Thu, 6 Aug 2020 15:19:09 -0700 Subject: [PATCH] Now that we have a testutil package, put ioutil.go into it Signed-off-by: Ryan Richard --- cmd/placeholder-name/main_test.go | 14 +++----------- internal/testutil/ioutil.go | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 internal/testutil/ioutil.go diff --git a/cmd/placeholder-name/main_test.go b/cmd/placeholder-name/main_test.go index 7ec00b2e8..34d49e84e 100644 --- a/cmd/placeholder-name/main_test.go +++ b/cmd/placeholder-name/main_test.go @@ -9,10 +9,11 @@ import ( "bytes" "context" "fmt" - "io" "testing" "time" + "github.com/suzerain-io/placeholder-name/internal/testutil" + "github.com/sclevine/spec" "github.com/sclevine/spec/report" "github.com/stretchr/testify/require" @@ -20,15 +21,6 @@ import ( "github.com/suzerain-io/placeholder-name/pkg/client" ) -// errorWriter implements io.Writer by returning a fixed error. -type errorWriter struct { - returnError error -} - -var _ io.Writer = &errorWriter{} - -func (e *errorWriter) Write([]byte) (int, error) { return 0, e.returnError } - func TestRun(t *testing.T) { spec.Run(t, "main.run", func(t *testing.T, when spec.G, it spec.S) { var r *require.Assertions @@ -95,7 +87,7 @@ func TestRun(t *testing.T) { }) it("returns an error", func() { - err := run(envGetter, tokenExchanger, &errorWriter{returnError: fmt.Errorf("some IO error")}, 30*time.Second) + err := run(envGetter, tokenExchanger, &testutil.ErrorWriter{ReturnError: fmt.Errorf("some IO error")}, 30*time.Second) r.EqualError(err, "failed to marshal response to stdout: some IO error") }) }) diff --git a/internal/testutil/ioutil.go b/internal/testutil/ioutil.go new file mode 100644 index 000000000..b0683fa26 --- /dev/null +++ b/internal/testutil/ioutil.go @@ -0,0 +1,17 @@ +/* +Copyright 2020 VMware, Inc. +SPDX-License-Identifier: Apache-2.0 +*/ + +package testutil + +import "io" + +// ErrorWriter implements io.Writer by returning a fixed error. +type ErrorWriter struct { + ReturnError error +} + +var _ io.Writer = &ErrorWriter{} + +func (e *ErrorWriter) Write([]byte) (int, error) { return 0, e.ReturnError }