github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8736 from dcantah/testcontainerpids-windows

Browse Source 
Integration: Alter TestContainerPids for Windows
This commit is contained in:
Maksym Pavlenko 2023-10-17 13:26:13 -07:00 committed by GitHub
commit bb27db4970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
integration/client/container_test.go
View File

@ -570,18 +570,34 @@ func TestContainerPids(t *testing.T) {
if taskPid < 1 {
t.Errorf("invalid task pid %d", taskPid)
}
processes, err := task.Pids(ctx)
switch runtime.GOOS {
case "windows":
// TODO: This is currently not implemented on windows
default:
if err != nil {
t.Fatal(err)
}
l := len(processes)
// The point of this test is to see that we successfully can get all of
// the pids running in the container and they match the number expected,
// but for Windows this concept is a bit different. Windows containers
// essentially go through the usermode boot phase of the operating system,
// and have quite a few processes and system services running outside of
// the "init" process you specify. Because of this, there's not a great
// way to say "there should only be N processes running" like we can ensure
// for Linux based off the process we asked to run.
//
// With all that said, on Windows lets check that we're greater than one
// ("init" + system services/procs)
if runtime.GOOS == "windows" {
if l <= 1 {
t.Errorf("expected more than one process but received %d", l)
}
} else {
// 2 processes, 1 for sh and one for sleep
if l := len(processes); l != 2 {
if l != 2 {
t.Errorf("expected 2 process but received %d", l)
}
}
var found bool
for _, p := range processes {
@ -593,7 +609,6 @@ func TestContainerPids(t *testing.T) {
if !found {
t.Errorf("pid %d must be in %+v", taskPid, processes)
}
}
if err := task.Kill(ctx, syscall.SIGKILL); err != nil {
select {
case s := <-statusC: