From aacb33bdaff7a9b660808b3d76f0b1fb43647fb3 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 23 Aug 2017 17:26:27 -0400
Subject: [PATCH] Remove pkg/testutil tempfile and golden

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 468154a841b599dd3a7acaf6162e2a73cf44d1f6
Component: engine
---
 .../engine/pkg/testutil/golden/golden.go      | 28 ----------
 .../engine/pkg/testutil/tempfile/tempfile.go  | 56 -------------------
 2 files changed, 84 deletions(-)
 delete mode 100644 components/engine/pkg/testutil/golden/golden.go
 delete mode 100644 components/engine/pkg/testutil/tempfile/tempfile.go

diff --git a/components/engine/pkg/testutil/golden/golden.go b/components/engine/pkg/testutil/golden/golden.go
deleted file mode 100644
index 8f725da7bf..0000000000
--- a/components/engine/pkg/testutil/golden/golden.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Package golden provides function and helpers to use golden file for
-// testing purpose.
-package golden
-
-import (
-	"flag"
-	"io/ioutil"
-	"path/filepath"
-	"testing"
-)
-
-var update = flag.Bool("test.update", false, "update golden file")
-
-// Get returns the golden file content. If the `test.update` is specified, it updates the
-// file with the current output and returns it.
-func Get(t *testing.T, actual []byte, filename string) []byte {
-	golden := filepath.Join("testdata", filename)
-	if *update {
-		if err := ioutil.WriteFile(golden, actual, 0644); err != nil {
-			t.Fatal(err)
-		}
-	}
-	expected, err := ioutil.ReadFile(golden)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return expected
-}
diff --git a/components/engine/pkg/testutil/tempfile/tempfile.go b/components/engine/pkg/testutil/tempfile/tempfile.go
deleted file mode 100644
index 01474babff..0000000000
--- a/components/engine/pkg/testutil/tempfile/tempfile.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package tempfile
-
-import (
-	"io/ioutil"
-	"os"
-
-	"github.com/stretchr/testify/require"
-)
-
-// TempFile is a temporary file that can be used with unit tests. TempFile
-// reduces the boilerplate setup required in each test case by handling
-// setup errors.
-type TempFile struct {
-	File *os.File
-}
-
-// NewTempFile returns a new temp file with contents
-func NewTempFile(t require.TestingT, prefix string, content string) *TempFile {
-	file, err := ioutil.TempFile("", prefix+"-")
-	require.NoError(t, err)
-
-	_, err = file.Write([]byte(content))
-	require.NoError(t, err)
-	file.Close()
-	return &TempFile{File: file}
-}
-
-// Name returns the filename
-func (f *TempFile) Name() string {
-	return f.File.Name()
-}
-
-// Remove removes the file
-func (f *TempFile) Remove() {
-	os.Remove(f.Name())
-}
-
-// TempDir is a temporary directory that can be used with unit tests. TempDir
-// reduces the boilerplate setup required in each test case by handling
-// setup errors.
-type TempDir struct {
-	Path string
-}
-
-// NewTempDir returns a new temp file with contents
-func NewTempDir(t require.TestingT, prefix string) *TempDir {
-	path, err := ioutil.TempDir("", prefix+"-")
-	require.NoError(t, err)
-
-	return &TempDir{Path: path}
-}
-
-// Remove removes the file
-func (f *TempDir) Remove() {
-	os.Remove(f.Path)
-}