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

OCI Modifiers for Windows

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>

Needed for the containerd work on Windows and integrating the
oci package from containerd into moby.

No longer sets defaults for
 - .Process.ConsoleSize
 - .Windows.IgnoreFlushesDuringBoot
 - .Windows.Network.AllowUnqualifiedDNSQuery

Adds helper functions and tests for
 - WithWindowsIgnoreFlushesDuringBoot
 - WithWindowNetworksAllowUnqualifiedDNSQuery

Updates `ctr run` on Windows to use the new helper functions,
ConsoleSize is already handled.
This commit is contained in:
John Howard
2019-02-05 12:50:16 -08:00
parent a410405f5d
commit 59ea134ce1
5 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
oci/spec_opts_windows_test.go
View File

@@ -56,3 +56,57 @@ func TestWithCPUCount(t *testing.T) {
}
}
}
func TestWithWindowsIgnoreFlushesDuringBoot(t *testing.T) {
var (
ctx = namespaces.WithNamespace(context.Background(), "testing")
c = containers.Container{ID: t.Name()}
o = WithWindowsIgnoreFlushesDuringBoot()
)
// Test with all supported scenarios
platforms := []string{"", "windows/amd64"}
for _, p := range platforms {
var spec *Spec
var err error
if p == "" {
t.Log("Testing GenerateSpec default platform")
spec, err = GenerateSpec(ctx, nil, &c, o)
} else {
t.Logf("Testing GenerateSpecWithPlatform with platform: '%s'", p)
spec, err = GenerateSpecWithPlatform(ctx, nil, p, &c, o)
}
if err != nil {
t.Fatalf("failed to generate spec with: %v", err)
}
if spec.Windows.IgnoreFlushesDuringBoot != true {
t.Fatalf("spec.Windows.IgnoreFlushesDuringBoot expected: true")
}
}
}
func TestWithWindowNetworksAllowUnqualifiedDNSQuery(t *testing.T) {
var (
ctx = namespaces.WithNamespace(context.Background(), "testing")
c = containers.Container{ID: t.Name()}
o = WithWindowNetworksAllowUnqualifiedDNSQuery()
)
// Test with all supported scenarios
platforms := []string{"", "windows/amd64"}
for _, p := range platforms {
var spec *Spec
var err error
if p == "" {
t.Log("Testing GenerateSpec default platform")
spec, err = GenerateSpec(ctx, nil, &c, o)
} else {
t.Logf("Testing GenerateSpecWithPlatform with platform: '%s'", p)
spec, err = GenerateSpecWithPlatform(ctx, nil, p, &c, o)
}
if err != nil {
t.Fatalf("failed to generate spec with: %v", err)
}
if spec.Windows.Network.AllowUnqualifiedDNSQuery != true {
t.Fatalf("spec.Windows.Network.AllowUnqualifiedDNSQuery expected: true")
}
}
}