Commit 4d3b5b6b authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

unionfs: make tests more idiomatic

These two tests failed in recent travis runs.
parent 849b50c1
...@@ -812,28 +812,28 @@ func TestUnionFsCopyChmod(t *testing.T) { ...@@ -812,28 +812,28 @@ func TestUnionFsCopyChmod(t *testing.T) {
fn := wd + "/mnt/y" fn := wd + "/mnt/y"
err := ioutil.WriteFile(fn, []byte(contents), 0644) err := ioutil.WriteFile(fn, []byte(contents), 0644)
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile(%v): %v", fn, err)
} }
err = os.Chmod(fn, 0755) err = os.Chmod(fn, 0755)
if err != nil { if err != nil {
t.Fatalf("Chmod failed: %v", err) t.Fatalf("Chmod(%v): %v", fn, err)
} }
fi, err := os.Lstat(fn) fi, err := os.Lstat(fn)
if err != nil { if err != nil {
t.Fatalf("Lstat failed: %v", err) t.Fatalf("Lstat(%v): %v", fn, err)
} }
if fi.Mode()&0111 == 0 { if fi.Mode()&0111 == 0 {
t.Errorf("1st attr error %o", fi.Mode()) t.Errorf("Lstat(%v): mode %o", fn, fi.Mode())
} }
time.Sleep(entryTtl) time.Sleep(entryTtl)
fi, err = os.Lstat(fn) fi, err = os.Lstat(fn)
if err != nil { if err != nil {
t.Fatalf("Lstat failed: %v", err) t.Fatalf("Lstat(%v) after sleep: %v", fn, err)
} }
if fi.Mode()&0111 == 0 { if fi.Mode()&0111 == 0 {
t.Errorf("uncached attr error %o", fi.Mode()) t.Errorf("Lstat(%v) after sleep: mode %o", fn, fi.Mode())
} }
} }
...@@ -852,23 +852,23 @@ func TestUnionFsTruncateTimestamp(t *testing.T) { ...@@ -852,23 +852,23 @@ func TestUnionFsTruncateTimestamp(t *testing.T) {
fn := wd + "/mnt/y" fn := wd + "/mnt/y"
err := ioutil.WriteFile(fn, []byte(contents), 0644) err := ioutil.WriteFile(fn, []byte(contents), 0644)
if err != nil { if err != nil {
t.Fatalf("WriteFile failed: %v", err) t.Fatalf("WriteFile(%v): %v", fn, err)
} }
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
truncTs := time.Now() truncTs := time.Now()
err = os.Truncate(fn, 3) err = os.Truncate(fn, 3)
if err != nil { if err != nil {
t.Fatalf("Truncate failed: %v", err) t.Fatalf("Truncate(%v): %v", fn, err)
} }
fi, err := os.Lstat(fn) fi, err := os.Lstat(fn)
if err != nil { if err != nil {
t.Fatalf("Lstat failed: %v", err) t.Fatalf("Lstat(%v): %v", fn, err)
} }
if truncTs.Sub(fi.ModTime()) > 100*time.Millisecond { if truncTs.Sub(fi.ModTime()) > 100*time.Millisecond {
t.Error("timestamp drift", truncTs, fi.ModTime()) t.Errorf("after Truncate: got TS %v, want %v", fi.ModTime(), truncTs)
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment