unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #183 from marineam/fix

Browse Source 
tests: fix error messages, use Fatalf
This commit is contained in:
Michael Marineau 2014-07-11 15:40:54 -07:00
commit f0450662b0
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
system/env_file_test.go
View File

@ -44,7 +44,7 @@ func TestWriteEnvFileUpdate(t *testing.T) {
oldStat, err := os.Stat(fullPath) oldStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
ef := EnvFile{ ef := EnvFile{
@ -70,11 +70,11 @@ func TestWriteEnvFileUpdate(t *testing.T) {
newStat, err := os.Stat(fullPath) newStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
if oldStat.Sys().(*syscall.Stat_t).Ino == newStat.Sys().(*syscall.Stat_t).Ino { if oldStat.Sys().(*syscall.Stat_t).Ino == newStat.Sys().(*syscall.Stat_t).Ino {
t.Fatal("File was not replaced: %s", fullPath) t.Fatalf("File was not replaced: %s", fullPath)
} }
} }
@ -91,7 +91,7 @@ func TestWriteEnvFileUpdateNoNewline(t *testing.T) {
oldStat, err := os.Stat(fullPath) oldStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
ef := EnvFile{ ef := EnvFile{
@ -117,11 +117,11 @@ func TestWriteEnvFileUpdateNoNewline(t *testing.T) {
newStat, err := os.Stat(fullPath) newStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
if oldStat.Sys().(*syscall.Stat_t).Ino == newStat.Sys().(*syscall.Stat_t).Ino { if oldStat.Sys().(*syscall.Stat_t).Ino == newStat.Sys().(*syscall.Stat_t).Ino {
t.Fatal("File was not replaced: %s", fullPath) t.Fatalf("File was not replaced: %s", fullPath)
} }
} }
@ -170,7 +170,7 @@ func TestWriteEnvFileNoop(t *testing.T) {
oldStat, err := os.Stat(fullPath) oldStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
ef := EnvFile{ ef := EnvFile{
@ -196,11 +196,11 @@ func TestWriteEnvFileNoop(t *testing.T) {
newStat, err := os.Stat(fullPath) newStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
if oldStat.Sys().(*syscall.Stat_t).Ino != newStat.Sys().(*syscall.Stat_t).Ino { if oldStat.Sys().(*syscall.Stat_t).Ino != newStat.Sys().(*syscall.Stat_t).Ino {
t.Fatal("File was replaced: %s", fullPath) t.Fatalf("File was replaced: %s", fullPath)
} }
} }
@ -217,7 +217,7 @@ func TestWriteEnvFileUpdateDos(t *testing.T) {
oldStat, err := os.Stat(fullPath) oldStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
ef := EnvFile{ ef := EnvFile{
@ -243,11 +243,11 @@ func TestWriteEnvFileUpdateDos(t *testing.T) {
newStat, err := os.Stat(fullPath) newStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
if oldStat.Sys().(*syscall.Stat_t).Ino == newStat.Sys().(*syscall.Stat_t).Ino { if oldStat.Sys().(*syscall.Stat_t).Ino == newStat.Sys().(*syscall.Stat_t).Ino {
t.Fatal("File was not replaced: %s", fullPath) t.Fatalf("File was not replaced: %s", fullPath)
} }
} }
@ -266,7 +266,7 @@ func TestWriteEnvFileDos2Unix(t *testing.T) {
oldStat, err := os.Stat(fullPath) oldStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
ef := EnvFile{ ef := EnvFile{
@ -292,11 +292,11 @@ func TestWriteEnvFileDos2Unix(t *testing.T) {
newStat, err := os.Stat(fullPath) newStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
if oldStat.Sys().(*syscall.Stat_t).Ino == newStat.Sys().(*syscall.Stat_t).Ino { if oldStat.Sys().(*syscall.Stat_t).Ino == newStat.Sys().(*syscall.Stat_t).Ino {
t.Fatal("File was not replaced: %s", fullPath) t.Fatalf("File was not replaced: %s", fullPath)
} }
} }
@ -314,7 +314,7 @@ func TestWriteEnvFileEmpty(t *testing.T) {
oldStat, err := os.Stat(fullPath) oldStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
ef := EnvFile{ ef := EnvFile{
@ -340,11 +340,11 @@ func TestWriteEnvFileEmpty(t *testing.T) {
newStat, err := os.Stat(fullPath) newStat, err := os.Stat(fullPath)
if err != nil { if err != nil {
t.Fatal("Unable to stat file: %v", err) t.Fatalf("Unable to stat file: %v", err)
} }
if oldStat.Sys().(*syscall.Stat_t).Ino != newStat.Sys().(*syscall.Stat_t).Ino { if oldStat.Sys().(*syscall.Stat_t).Ino != newStat.Sys().(*syscall.Stat_t).Ino {
t.Fatal("File was replaced: %s", fullPath) t.Fatalf("File was replaced: %s", fullPath)
} }
} }