Skip to content

Commit 642d816

Browse files
author
Luca Bianconi
committed
test: improved flaky test
1 parent daeaf78 commit 642d816

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Diff for: buildcache/build_cache_test.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ func Test_UpdateLastUsedFileNotExisting(t *testing.T) {
1414
testBuildDir := paths.New(t.TempDir(), "sketches", "sketch-xxx")
1515
err := os.MkdirAll(testBuildDir.String(), 0770)
1616
require.Nil(t, err)
17-
requireCorrectUpdate(t, testBuildDir)
17+
timeBeforeUpdating := time.Unix(0, 0)
18+
requireCorrectUpdate(t, testBuildDir, timeBeforeUpdating)
1819
}
1920

2021
func Test_UpdateLastUsedFileExisting(t *testing.T) {
@@ -24,21 +25,22 @@ func Test_UpdateLastUsedFileExisting(t *testing.T) {
2425
require.Nil(t, err)
2526

2627
// create the file
27-
err = paths.New(testBuildDir.Join(lastUsedFileName).String()).WriteFile([]byte{})
28+
preExistingFile := testBuildDir.Join(lastUsedFileName).String()
29+
err = paths.New(preExistingFile).WriteFile([]byte{})
2830
require.Nil(t, err)
29-
30-
requireCorrectUpdate(t, testBuildDir)
31+
timeBeforeUpdating := time.Now().Add(-time.Second)
32+
os.Chtimes(preExistingFile, time.Now(), timeBeforeUpdating)
33+
requireCorrectUpdate(t, testBuildDir, timeBeforeUpdating)
3134
}
3235

33-
func requireCorrectUpdate(t *testing.T, dir *paths.Path) {
34-
timeBeforeUpdating := time.Now()
36+
func requireCorrectUpdate(t *testing.T, dir *paths.Path, prevModTime time.Time) {
3537
err := UpdateLastUsedTime(dir)
3638
require.Nil(t, err)
3739
expectedFile := dir.Join(lastUsedFileName)
3840
fileInfo, err := os.Stat(expectedFile.String())
3941
require.Nil(t, err)
4042

41-
require.GreaterOrEqual(t, fileInfo.ModTime(), timeBeforeUpdating)
43+
require.GreaterOrEqual(t, fileInfo.ModTime(), prevModTime)
4244
}
4345

4446
func TestPurge(t *testing.T) {

0 commit comments

Comments
 (0)