perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/ignore: Don't slow down tests by sleeping

Browse Source
This commit is contained in:
Jakob Borg 2016-11-22 22:44:04 +01:00
parent a2b8485a89
commit 2dbeea21c4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ignore/ignore_test.go
View File

@ -280,9 +280,10 @@ func TestCaching(t *testing.T) {
// Modify the include file, expect empty cache. Ensure the timestamp on // Modify the include file, expect empty cache. Ensure the timestamp on
// the file changes. // the file changes.
time.Sleep(time.Second)
fd2.WriteString("/z/\n") fd2.WriteString("/z/\n")
fd2.Sync() fd2.Sync()
fakeTime := time.Now().Add(5 * time.Second)
os.Chtimes(fd2.Name(), fakeTime, fakeTime)
err = pats.Load(fd1.Name()) err = pats.Load(fd1.Name())
if err != nil { if err != nil {
@ -311,9 +312,10 @@ func TestCaching(t *testing.T) {
// Modify the root file, expect cache to be invalidated // Modify the root file, expect cache to be invalidated
time.Sleep(time.Second)
fd1.WriteString("/a/\n") fd1.WriteString("/a/\n")
fd1.Sync() fd1.Sync()
fakeTime = time.Now().Add(5 * time.Second)
os.Chtimes(fd1.Name(), fakeTime, fakeTime)
err = pats.Load(fd1.Name()) err = pats.Load(fd1.Name())
if err != nil { if err != nil {
@ -478,8 +480,6 @@ func TestCacheReload(t *testing.T) {
// Rewrite file to match f1 and f3 // Rewrite file to match f1 and f3
time.Sleep(time.Second)
err = fd.Truncate(0) err = fd.Truncate(0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -492,6 +492,9 @@ func TestCacheReload(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
fd.Sync()
fakeTime := time.Now().Add(5 * time.Second)
os.Chtimes(fd.Name(), fakeTime, fakeTime)
err = pats.Load(fd.Name()) err = pats.Load(fd.Name())
if err != nil { if err != nil {