Skip to content

Commit 82d6c2f

Browse files
committed
Revert container_stats_test.go change which caused Windows CRI integration test failure
PR containerd#7892 which supposed to fix issue on Linux introduced random failure on Windows, this commit is to revert that change for Windows platform Signed-off-by: Tony Fang <[email protected]>
1 parent 5e7baa2 commit 82d6c2f

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

integration/container_stats_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,14 @@ func TestContainerConsumedStats(t *testing.T) {
103103
if err != nil {
104104
return false, err
105105
}
106-
if s.GetWritableLayer().GetTimestamp() > 0 {
107-
return true, nil
106+
if goruntime.GOOS == "windows" {
107+
if s.GetMemory().GetWorkingSetBytes().GetValue() > 0 {
108+
return true, nil
109+
}
110+
} else {
111+
if s.GetWritableLayer().GetTimestamp() > 0 {
112+
return true, nil
113+
}
108114
}
109115
return false, nil
110116
}, time.Second, 30*time.Second))

0 commit comments

Comments
 (0)