mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
integration-cli: TestEventsOOM* broken on GitHub Runner
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit b8bf60c590)
This commit is contained in:
@@ -19,6 +19,7 @@ import (
|
||||
"golang.org/x/sys/unix"
|
||||
"gotest.tools/v3/assert"
|
||||
is "gotest.tools/v3/assert/cmp"
|
||||
"gotest.tools/v3/skip"
|
||||
)
|
||||
|
||||
// #5979
|
||||
@@ -50,6 +51,7 @@ func (s *DockerCLIEventSuite) TestEventsRedirectStdout(c *testing.T) {
|
||||
|
||||
func (s *DockerCLIEventSuite) TestEventsOOMDisableFalse(c *testing.T) {
|
||||
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, swapMemorySupport, NotPpc64le)
|
||||
skip.If(c, GitHubActions, "FIXME: https://github.com/moby/moby/pull/36541")
|
||||
|
||||
errChan := make(chan error, 1)
|
||||
go func() {
|
||||
@@ -80,6 +82,7 @@ func (s *DockerCLIEventSuite) TestEventsOOMDisableFalse(c *testing.T) {
|
||||
|
||||
func (s *DockerCLIEventSuite) TestEventsOOMDisableTrue(c *testing.T) {
|
||||
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotArm, swapMemorySupport, NotPpc64le)
|
||||
skip.If(c, GitHubActions, "FIXME: https://github.com/moby/moby/pull/36541")
|
||||
|
||||
errChan := make(chan error, 1)
|
||||
observer, err := newEventObserver(c)
|
||||
|
||||
@@ -68,6 +68,10 @@ func UnixCli() bool {
|
||||
return isUnixCli
|
||||
}
|
||||
|
||||
func GitHubActions() bool {
|
||||
return os.Getenv("GITHUB_ACTIONS") != ""
|
||||
}
|
||||
|
||||
func Network() bool {
|
||||
// Set a timeout on the GET at 15s
|
||||
const timeout = 15 * time.Second
|
||||
|
||||
@@ -224,5 +224,5 @@ func EnsureFrozenImagesLinux(testEnv *Execution) error {
|
||||
|
||||
// GitHubActions is true if test is executed on a GitHub Runner.
|
||||
func (e *Execution) GitHubActions() bool {
|
||||
return os.Getenv("GITHUB_ACTIONS") == "true"
|
||||
return os.Getenv("GITHUB_ACTIONS") != ""
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user