Merge pull request #7042 from samuelkarp/freebsd-unit-tests

mxpv · web-flow · commit e71ffddb6b69 · 2022-06-10T15:05:52.000-07:00
Port (some) unit tests to FreeBSD
diff --git a/archive/link_default.go b/archive/link_default.go
@@ -0,0 +1,25 @@
+//go:build !freebsd
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package archive
+
+import "os"
+
+func link(oldname, newname string) error {
+	return os.Link(oldname, newname)
+}
diff --git a/archive/link_freebsd.go b/archive/link_freebsd.go
@@ -0,0 +1,82 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package archive
+
+import (
+	"os"
+	"syscall"
+
+	"golang.org/x/sys/unix"
+)
+
+func link(oldname, newname string) error {
+	e := ignoringEINTR(func() error {
+		return unix.Linkat(unix.AT_FDCWD, oldname, unix.AT_FDCWD, newname, 0)
+	})
+	if e != nil {
+		return &os.LinkError{Op: "link", Old: oldname, New: newname, Err: e}
+	}
+	return nil
+}
+
+// The following contents were copied from Go 1.18.2.
+// Use of this source code is governed by the following
+// BSD-style license:
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//   * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//   * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// ignoringEINTR makes a function call and repeats it if it returns an
+// EINTR error. This appears to be required even though we install all
+// signal handlers with SA_RESTART: see #22838, #38033, #38836, #40846.
+// Also #20400 and #36644 are issues in which a signal handler is
+// installed without setting SA_RESTART. None of these are the common case,
+// but there are enough of them that it seems that we can't avoid
+// an EINTR loop.
+func ignoringEINTR(fn func() error) error {
+	for {
+		err := fn()
+		if err != syscall.EINTR {
+			return err
+		}
+	}
+}
diff --git a/archive/tar.go b/archive/tar.go
@@ -361,7 +361,7 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header
 			return err
 		}
 
-		if err := os.Link(targetPath, path); err != nil {
+		if err := link(targetPath, path); err != nil {
 			return err
 		}
 
diff --git a/archive/tar_test.go b/archive/tar_test.go
@@ -844,7 +844,7 @@ func testApply(t *testing.T, a fstest.Applier) error {
 		return fmt.Errorf("failed to apply filesystem changes: %w", err)
 	}
 
-	tarArgs := []string{"c", "-C", td}
+	tarArgs := []string{"cf", "-", "-C", td}
 	names, err := readDirNames(td)
 	if err != nil {
 		return fmt.Errorf("failed to read directory names: %w", err)
@@ -879,9 +879,12 @@ func testBaseDiff(t *testing.T, a fstest.Applier) error {
 
 	arch := Diff(context.Background(), "", td)
 
-	cmd := exec.Command(tarCmd, "x", "-C", dest)
+	cmd := exec.Command(tarCmd, "xf", "-", "-C", dest)
 	cmd.Stdin = arch
+	stderr := &bytes.Buffer{}
+	cmd.Stderr = stderr
 	if err := cmd.Run(); err != nil {
+		fmt.Println(stderr.String())
 		return fmt.Errorf("tar command failed: %w", err)
 	}
 
diff --git a/oci/mounts_freebsd.go b/oci/mounts_freebsd.go
@@ -32,7 +32,6 @@ func defaultMounts() []specs.Mount {
 			Destination: "/dev/fd",
 			Type:        "fdescfs",
 			Source:      "fdescfs",
-			Options:     []string{},
 		},
 	}
 }
diff --git a/oci/utils_unix_test.go b/oci/utils_unix_test.go
@@ -23,6 +23,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"runtime"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -149,9 +150,11 @@ func TestHostDevicesAllValid(t *testing.T) {
 	}
 
 	for _, device := range devices {
-		// Devices can't have major number 0.
-		if device.Major == 0 {
-			t.Errorf("device entry %+v has zero major number", device)
+		if runtime.GOOS != "freebsd" {
+			// On Linux, devices can't have major number 0.
+			if device.Major == 0 {
+				t.Errorf("device entry %+v has zero major number", device)
+			}
 		}
 		switch device.Type {
 		case blockDevice, charDevice:
diff --git a/pkg/cri/server/container_create_test.go b/pkg/cri/server/container_create_test.go
@@ -69,8 +69,11 @@ func TestGeneralContainerSpec(t *testing.T) {
 }
 
 func TestPodAnnotationPassthroughContainerSpec(t *testing.T) {
-	if goruntime.GOOS == "darwin" {
+	switch goruntime.GOOS {
+	case "darwin":
 		t.Skip("not implemented on Darwin")
+	case "freebsd":
+		t.Skip("not implemented on FreeBSD")
 	}
 
 	testID := "test-id"
@@ -279,8 +282,11 @@ func TestVolumeMounts(t *testing.T) {
 }
 
 func TestContainerAnnotationPassthroughContainerSpec(t *testing.T) {
-	if goruntime.GOOS == "darwin" {
+	switch goruntime.GOOS {
+	case "darwin":
 		t.Skip("not implemented on Darwin")
+	case "freebsd":
+		t.Skip("not implemented on FreeBSD")
 	}
 
 	testID := "test-id"
diff --git a/pkg/cri/server/sandbox_run_test.go b/pkg/cri/server/sandbox_run_test.go
@@ -35,10 +35,12 @@ import (
 )
 
 func TestSandboxContainerSpec(t *testing.T) {
-	if goruntime.GOOS == "darwin" {
+	switch goruntime.GOOS {
+	case "darwin":
 		t.Skip("not implemented on Darwin")
+	case "freebsd":
+		t.Skip("not implemented on FreeBSD")
 	}
-
 	testID := "test-id"
 	nsPath := "test-cni"
 	for desc, test := range map[string]struct {
diff --git a/platforms/defaults_freebsd.go b/platforms/defaults_freebsd.go
@@ -17,8 +17,9 @@
 package platforms
 
 import (
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"runtime"
+
+	specs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 // DefaultSpec returns the current platform's default platform specification.

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header`
`361`	`361`	`return err`
`362`	`362`	`}`
`363`	`363`
`364`		`- if err := os.Link(targetPath, path); err != nil {`
	`364`	`+ if err := link(targetPath, path); err != nil {`
`365`	`365`	`return err`
`366`	`366`	`}`
`367`	`367`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ func defaultMounts() []specs.Mount {`
`32`	`32`	`Destination: "/dev/fd",`
`33`	`33`	`Type: "fdescfs",`
`34`	`34`	`Source: "fdescfs",`
`35`		`- Options: []string{},`
`36`	`35`	`},`
`37`	`36`	`}`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,11 @@ func TestGeneralContainerSpec(t *testing.T) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func TestPodAnnotationPassthroughContainerSpec(t *testing.T) {`
`72`		`- if goruntime.GOOS == "darwin" {`
	`72`	`+ switch goruntime.GOOS {`
	`73`	`+ case "darwin":`
`73`	`74`	`t.Skip("not implemented on Darwin")`
	`75`	`+ case "freebsd":`
	`76`	`+ t.Skip("not implemented on FreeBSD")`
`74`	`77`	`}`
`75`	`78`
`76`	`79`	`testID := "test-id"`
`@@ -279,8 +282,11 @@ func TestVolumeMounts(t *testing.T) {`
`279`	`282`	`}`
`280`	`283`
`281`	`284`	`func TestContainerAnnotationPassthroughContainerSpec(t *testing.T) {`
`282`		`- if goruntime.GOOS == "darwin" {`
	`285`	`+ switch goruntime.GOOS {`
	`286`	`+ case "darwin":`
`283`	`287`	`t.Skip("not implemented on Darwin")`
	`288`	`+ case "freebsd":`
	`289`	`+ t.Skip("not implemented on FreeBSD")`
`284`	`290`	`}`
`285`	`291`
`286`	`292`	`testID := "test-id"`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,12 @@ import (`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`func TestSandboxContainerSpec(t *testing.T) {`
`38`		`- if goruntime.GOOS == "darwin" {`
	`38`	`+ switch goruntime.GOOS {`
	`39`	`+ case "darwin":`
`39`	`40`	`t.Skip("not implemented on Darwin")`
	`41`	`+ case "freebsd":`
	`42`	`+ t.Skip("not implemented on FreeBSD")`
`40`	`43`	`}`
`41`		`-`
`42`	`44`	`testID := "test-id"`
`43`	`45`	`nsPath := "test-cni"`
`44`	`46`	`for desc, test := range map[string]struct {`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@`
`17`	`17`	`package platforms`
`18`	`18`
`19`	`19`	`import (`
`20`		`- specs "github.com/opencontainers/image-spec/specs-go/v1"`
`21`	`20`	`"runtime"`
	`21`	`+`
	`22`	`+ specs "github.com/opencontainers/image-spec/specs-go/v1"`
`22`	`23`	`)`
`23`	`24`
`24`	`25`	`// DefaultSpec returns the current platform's default platform specification.`