From 448abb61eba5f5acbafed46da405cf2f66582dd6 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Thu, 16 Nov 2017 14:17:28 +0100 Subject: [PATCH 1/2] accounts/keystore: change modtime for test cases to be bigger than 1sec. --- accounts/keystore/account_cache_test.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index e3dc31065..9bbc1b2ef 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -59,7 +59,7 @@ func TestWatchNewFile(t *testing.T) { // Ensure the watcher is started before adding any files. ks.Accounts() - time.Sleep(200 * time.Millisecond) + time.Sleep(1000 * time.Millisecond) // Move in the files. wantAccounts := make([]accounts.Account, len(cachetestAccounts)) @@ -349,6 +349,8 @@ func TestUpdatedKeyfileContents(t *testing.T) { return } + time.Sleep(1000 * time.Millisecond) + // Now replace file contents if err := forceCopyFile(file, cachetestAccounts[1].URL.Path); err != nil { t.Fatal(err) @@ -362,6 +364,8 @@ func TestUpdatedKeyfileContents(t *testing.T) { return } + time.Sleep(1000 * time.Millisecond) + // Now replace file contents again if err := forceCopyFile(file, cachetestAccounts[2].URL.Path); err != nil { t.Fatal(err) @@ -374,6 +378,9 @@ func TestUpdatedKeyfileContents(t *testing.T) { t.Error(err) return } + + time.Sleep(1000 * time.Millisecond) + // Now replace file contents with crap if err := ioutil.WriteFile(file, []byte("foo"), 0644); err != nil { t.Fatal(err) From b64525694b81d4f278b8d4690d29416844c72349 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Thu, 16 Nov 2017 15:01:02 +0100 Subject: [PATCH 2/2] accounts/keystore: comments above time.Sleep --- accounts/keystore/account_cache_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index 9bbc1b2ef..fe9233c04 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -349,6 +349,7 @@ func TestUpdatedKeyfileContents(t *testing.T) { return } + // needed so that modTime of `file` is different to its current value after forceCopyFile time.Sleep(1000 * time.Millisecond) // Now replace file contents @@ -364,6 +365,7 @@ func TestUpdatedKeyfileContents(t *testing.T) { return } + // needed so that modTime of `file` is different to its current value after forceCopyFile time.Sleep(1000 * time.Millisecond) // Now replace file contents again @@ -379,6 +381,7 @@ func TestUpdatedKeyfileContents(t *testing.T) { return } + // needed so that modTime of `file` is different to its current value after ioutil.WriteFile time.Sleep(1000 * time.Millisecond) // Now replace file contents with crap