mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
integration-cli: split DockerSuite into subsequent build suites
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
@@ -12,6 +12,18 @@ import (
|
||||
"gotest.tools/v3/assert"
|
||||
)
|
||||
|
||||
type DockerCLIHealthSuite struct {
|
||||
ds *DockerSuite
|
||||
}
|
||||
|
||||
func (s *DockerCLIHealthSuite) TearDownTest(c *testing.T) {
|
||||
s.ds.TearDownTest(c)
|
||||
}
|
||||
|
||||
func (s *DockerCLIHealthSuite) OnTimeout(c *testing.T) {
|
||||
s.ds.OnTimeout(c)
|
||||
}
|
||||
|
||||
func waitForHealthStatus(c *testing.T, name string, prev string, expected string) {
|
||||
prev = prev + "\n"
|
||||
expected = expected + "\n"
|
||||
@@ -36,7 +48,7 @@ func getHealth(c *testing.T, name string) *types.Health {
|
||||
return &health
|
||||
}
|
||||
|
||||
func (s *DockerSuite) TestHealth(c *testing.T) {
|
||||
func (s *DockerCLIHealthSuite) TestHealth(c *testing.T) {
|
||||
testRequires(c, DaemonIsLinux) // busybox doesn't work on Windows
|
||||
|
||||
existingContainers := ExistingContainerIDs(c)
|
||||
@@ -144,7 +156,7 @@ func (s *DockerSuite) TestHealth(c *testing.T) {
|
||||
}
|
||||
|
||||
// GitHub #33021
|
||||
func (s *DockerSuite) TestUnsetEnvVarHealthCheck(c *testing.T) {
|
||||
func (s *DockerCLIHealthSuite) TestUnsetEnvVarHealthCheck(c *testing.T) {
|
||||
testRequires(c, DaemonIsLinux) // busybox doesn't work on Windows
|
||||
|
||||
imageName := "testhealth"
|
||||
|
||||
Reference in New Issue
Block a user