Merge pull request #4763 from estesp/cp-tests-fix-1.4

fuweid · web-flow · commit 9c24574c9964 · 2020-11-24T11:41:21.000+08:00
[release/1.4] re-enable unit tests in GitHub Actions environment
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -233,6 +233,15 @@ jobs:
           git fetch --tags origin "${SHIM_COMMIT}"
           git checkout "${SHIM_COMMIT}"
           GO111MODULE=on go build -mod=vendor -o "${bindir}/containerd-shim-runhcs-v1.exe" ./cmd/containerd-shim-runhcs-v1
+
+      - name: Tests
+        shell: bash
+        env:
+          CGO_ENABLED: 1
+        run: |
+          cd src/github.com/containerd/containerd
+          mingw32-make.exe test root-test
+
       - name: Integration 1
         shell: bash
         run: |
@@ -316,6 +325,15 @@ jobs:
           sudo make install
         working-directory: src/github.com/containerd/containerd
 
+      - name: Tests
+        env:
+          GOPROXY: direct
+          SKIPTESTS: github.com/containerd/containerd/snapshots/devmapper
+        run: |
+          make test
+          sudo -E PATH=$PATH GOPATH=$GOPATH GOPROXY=$GOPROXY make root-test
+        working-directory: src/github.com/containerd/containerd
+
       - name: Integration 1
         env:
           GOPROXY: direct
diff --git a/snapshots/overlay/overlay_test.go b/snapshots/overlay/overlay_test.go
@@ -174,6 +174,7 @@ func testOverlayOverlayMount(t *testing.T, newSnapshotter testsuite.SnapshotterF
 		lower = "lowerdir=" + getParents(ctx, o, root, "/tmp/layer2")[0]
 	)
 	for i, v := range []string{
+		"index=off",
 		work,
 		upper,
 		lower,
@@ -334,12 +335,12 @@ func testOverlayView(t *testing.T, newSnapshotter testsuite.SnapshotterFunc) {
 	if m.Source != "overlay" {
 		t.Errorf("mount source should be overlay but received %q", m.Source)
 	}
-	if len(m.Options) != 1 {
-		t.Errorf("expected 1 mount option but got %d", len(m.Options))
+	if len(m.Options) != 2 {
+		t.Errorf("expected 1 additional mount option but got %d", len(m.Options))
 	}
 	lowers := getParents(ctx, o, root, "/tmp/view2")
 	expected = fmt.Sprintf("lowerdir=%s:%s", lowers[0], lowers[1])
-	if m.Options[0] != expected {
+	if m.Options[1] != expected {
 		t.Errorf("expected option %q but received %q", expected, m.Options[0])
 	}
 }
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -18,6 +18,8 @@ package testsuite
 
 import (
 	"context"
+	//nolint:golint
+	_ "crypto/sha256"
 	"fmt"
 	"io/ioutil"
 	"math/rand"
diff --git a/sys/oom_unix_test.go b/sys/oom_unix_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestSetPositiveOomScoreAdjustment(t *testing.T) {
-	adjustment, err := adjustOom(123)
+	_, adjustment, err := adjustOom(123)
 	if err != nil {
 		t.Error(err)
 		return
@@ -44,7 +44,7 @@ func TestSetNegativeOomScoreAdjustmentWhenPrivileged(t *testing.T) {
 		return
 	}
 
-	adjustment, err := adjustOom(-123)
+	_, adjustment, err := adjustOom(-123)
 	if err != nil {
 		t.Error(err)
 		return
@@ -58,32 +58,37 @@ func TestSetNegativeOomScoreAdjustmentWhenUnprivilegedHasNoEffect(t *testing.T)
 		return
 	}
 
-	adjustment, err := adjustOom(-123)
+	initial, adjustment, err := adjustOom(-123)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	assert.Check(t, is.Equal(adjustment, 0))
+	assert.Check(t, is.Equal(adjustment, initial))
 }
 
-func adjustOom(adjustment int) (int, error) {
+func adjustOom(adjustment int) (int, int, error) {
 	cmd := exec.Command("sleep", "100")
 	if err := cmd.Start(); err != nil {
-		return 0, err
+		return 0, 0, err
 	}
 
 	defer cmd.Process.Kill()
 
 	pid, err := waitForPid(cmd.Process)
 	if err != nil {
-		return 0, err
+		return 0, 0, err
+	}
+	initial, err := GetOOMScoreAdj(pid)
+	if err != nil {
+		return 0, 0, err
 	}
 
 	if err := SetOOMScore(pid, adjustment); err != nil {
-		return 0, err
+		return 0, 0, err
 	}
 
-	return GetOOMScoreAdj(pid)
+	adj, err := GetOOMScoreAdj(pid)
+	return initial, adj, err
 }
 
 func waitForPid(process *os.Process) (int, error) {
diff --git a/vendor.conf b/vendor.conf
@@ -1,7 +1,7 @@
 github.com/beorn7/perks                             v1.0.1
 github.com/BurntSushi/toml                          v0.3.1
 github.com/cespare/xxhash/v2                        v2.1.1
-github.com/containerd/btrfs                         153935315f4ab9be5bf03650a1341454b05efa5d
+github.com/containerd/btrfs                         404b9149801e455c8076f615b06dc0abee0a977a
 github.com/containerd/cgroups                       318312a373405e5e91134d8063d04d59768a1bff
 github.com/containerd/console                       v1.0.0
 github.com/containerd/continuity                    efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
diff --git a/vendor/github.com/containerd/btrfs/btrfs.go b/vendor/github.com/containerd/btrfs/btrfs.go
diff --git a/vendor/github.com/containerd/btrfs/go.mod b/vendor/github.com/containerd/btrfs/go.mod

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ func testOverlayOverlayMount(t *testing.T, newSnapshotter testsuite.SnapshotterF`
`174`	`174`	`lower = "lowerdir=" + getParents(ctx, o, root, "/tmp/layer2")[0]`
`175`	`175`	`)`
`176`	`176`	`for i, v := range []string{`
	`177`	`+ "index=off",`
`177`	`178`	`work,`
`178`	`179`	`upper,`
`179`	`180`	`lower,`
`@@ -334,12 +335,12 @@ func testOverlayView(t *testing.T, newSnapshotter testsuite.SnapshotterFunc) {`
`334`	`335`	`if m.Source != "overlay" {`
`335`	`336`	`t.Errorf("mount source should be overlay but received %q", m.Source)`
`336`	`337`	`}`
`337`		`- if len(m.Options) != 1 {`
`338`		`- t.Errorf("expected 1 mount option but got %d", len(m.Options))`
	`338`	`+ if len(m.Options) != 2 {`
	`339`	`+ t.Errorf("expected 1 additional mount option but got %d", len(m.Options))`
`339`	`340`	`}`
`340`	`341`	`lowers := getParents(ctx, o, root, "/tmp/view2")`
`341`	`342`	`expected = fmt.Sprintf("lowerdir=%s:%s", lowers[0], lowers[1])`
`342`		`- if m.Options[0] != expected {`
	`343`	`+ if m.Options[1] != expected {`
`343`	`344`	`t.Errorf("expected option %q but received %q", expected, m.Options[0])`
`344`	`345`	`}`
`345`	`346`	`}`