diff options
author | Owen Waller <o.waller@kulawe.com> | 2014-09-10 19:47:31 +0100 |
---|---|---|
committer | spf13 <steve.francia@gmail.com> | 2014-11-04 19:18:36 -0500 |
commit | a54ad2bf3993225bca76b5aebd3a8f8d7082fd0a (patch) | |
tree | 5341e5e447f2f310caedb1a194bf4890da61592b /helpers/path_test.go | |
parent | e8bbc44ab0a249df4fe618fa22dfce2ed4e50ad3 (diff) |
Fix: Test TestSafeWriteToDisk now works
Oops, my bad.
Despite the function intending to test SafeWriteToDisk it was actually
calling WriteToDisk. WriteToDisk does not return the file exists error
that SafeWriteToDisk does, which the test checks for.
Diffstat (limited to 'helpers/path_test.go')
-rw-r--r-- | helpers/path_test.go | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/helpers/path_test.go b/helpers/path_test.go index 411f72099..9676e05f2 100644 --- a/helpers/path_test.go +++ b/helpers/path_test.go @@ -457,44 +457,42 @@ func TestFindCWD(t *testing.T) { } func TestSafeWriteToDisk(t *testing.T) { - /* - emptyFile, _ := createZeroSizedFileInTempDir() - defer deleteFileInTempDir(emptyFile) - tmpDir, _ := createEmptyTempDir() - defer deleteTempDir(tmpDir) - os.MkdirAll(tmpDir+"/this/dir/does/not/exist/", 0644) - - randomString := "This is a random string!" - reader := strings.NewReader(randomString) - - fileExists := fmt.Errorf("%v already exists", emptyFile.Name()) - type test struct { - filename string - expectedErr error - } + emptyFile, _ := createZeroSizedFileInTempDir() + defer deleteFileInTempDir(emptyFile) + tmpDir, _ := createEmptyTempDir() + defer deleteTempDir(tmpDir) + os.MkdirAll(tmpDir+"/this/dir/does/not/exist/", 0644) - data := []test{ - {emptyFile.Name(), fileExists}, - {tmpDir + "/" + emptyFile.Name(), nil}, - } + randomString := "This is a random string!" + reader := strings.NewReader(randomString) - for i, d := range data { - e := WriteToDisk(d.filename, reader) - t.Errorf("Failed: e is %q %#v", e, e) - if d.expectedErr != nil { - if d.expectedErr.Error() != e.Error() { - t.Errorf("Test %d failed. Expected error %q but got %q", i, d.expectedErr.Error(), e.Error()) - } - } - if d.expectedErr != e { - t.Errorf("Test %d failed. Expected %q but got %q", i, d.expectedErr, e) - } - contents, e := ioutil.ReadFile(d.filename) - if randomString != string(contents) { - t.Errorf("Test %d failed. Expected contents %q but got %q", i, randomString, string(contents)) + fileExists := fmt.Errorf("%v already exists", emptyFile.Name()) + type test struct { + filename string + expectedErr error + } + + data := []test{ + {emptyFile.Name(), fileExists}, + {tmpDir + "/" + emptyFile.Name(), nil}, + } + + for i, d := range data { + e := SafeWriteToDisk(d.filename, reader) + t.Errorf("Failed: e is %q %#v", e, e) + if d.expectedErr != nil { + if d.expectedErr.Error() != e.Error() { + t.Errorf("Test %d failed. Expected error %q but got %q", i, d.expectedErr.Error(), e.Error()) } } - */ + if d.expectedErr != e { + t.Errorf("Test %d failed. Expected %q but got %q", i, d.expectedErr, e) + } + contents, e := ioutil.ReadFile(d.filename) + if randomString != string(contents) { + t.Errorf("Test %d failed. Expected contents %q but got %q", i, randomString, string(contents)) + } + } } func TestWriteToDisk(t *testing.T) { |