Move generate valid test

generate/generate_test.go

@@ -1,87 +1,12 @@
 package generate_test
 
 import (
-	"os"
-	"path/filepath"
-	"runtime"
 	"testing"
 
-	rfc2119 "github.com/opencontainers/runtime-tools/error"
 	"github.com/opencontainers/runtime-tools/generate"
-	"github.com/opencontainers/runtime-tools/specerror"
-	"github.com/opencontainers/runtime-tools/validate"
 	"github.com/stretchr/testify/assert"
 )
 
-// Smoke test to ensure that _at the very least_ our default configuration
-// passes the validation tests. If this test fails, something is _very_ wrong
-// and needs to be fixed immediately (as it will break downstreams that depend
-// on us for a "sane default" and do compliance testing -- such as umoci).
-func TestGenerateValid(t *testing.T) {
-	plat := "linux"
-	if runtime.GOOS == "windows" {
-		plat = "windows"
-	}
-
-	isolations := []string{"process", "hyperv"}
-	for _, isolation := range isolations {
-		if plat == "linux" && isolation == "hyperv" {
-			// Combination doesn't make sense.
-			continue
-		}
-
-		bundle, err := os.MkdirTemp("", "TestGenerateValid_bundle")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer os.RemoveAll(bundle)
-
-		// Create our toy bundle.
-		rootfsPath := filepath.Join(bundle, "rootfs")
-		if err := os.Mkdir(rootfsPath, 0o755); err != nil {
-			t.Fatal(err)
-		}
-		configPath := filepath.Join(bundle, "config.json")
-		g, err := generate.New(plat)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if runtime.GOOS == "windows" {
-			g.AddWindowsLayerFolders("C:\\fakelayer")
-			g.AddWindowsLayerFolders("C:\\fakescratch")
-			if isolation == "process" {
-				// Add the Rootfs section (note: fake volume guid)
-				g.SetRootPath("\\\\?\\Volume{ec84d99e-3f02-11e7-ac6c-00155d7682cf}\\")
-			} else {
-				// Add the Hyper-V section
-				g.SetWindowsHypervUntilityVMPath("")
-			}
-		}
-		if err := (&g).SaveToFile(configPath, generate.ExportOptions{Seccomp: false}); err != nil {
-			t.Fatal(err)
-		}
-
-		// Validate the bundle.
-		v, err := validate.NewValidatorFromPath(bundle, true, runtime.GOOS)
-		if err != nil {
-			t.Errorf("unexpected NewValidatorFromPath error: %+v", err)
-		}
-		if err := v.CheckAll(); err != nil {
-			levelErrors, err := specerror.SplitLevel(err, rfc2119.Must)
-			if err != nil {
-				t.Errorf("unexpected non-multierror: %+v", err)
-				return
-			}
-			for _, e := range levelErrors.Warnings {
-				t.Logf("unexpected warning: %v", e)
-			}
-			if err := levelErrors.Error; err != nil {
-				t.Errorf("unexpected MUST error(s): %+v", err)
-			}
-		}
-	}
-}
-
 func TestRemoveMount(t *testing.T) {
 	g, err := generate.New("linux")
 	if err != nil {

validate/validate_test.go

@@ -11,9 +11,80 @@ import (
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/assert"
 
+	rfc2119 "github.com/opencontainers/runtime-tools/error"
+	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/runtime-tools/specerror"
 )
 
+// Smoke test to ensure that _at the very least_ our default configuration
+// passes the validation tests. If this test fails, something is _very_ wrong
+// and needs to be fixed immediately (as it will break downstreams that depend
+// on us for a "sane default" and do compliance testing -- such as umoci).
+func TestGenerateValid(t *testing.T) {
+	plat := "linux"
+	if runtime.GOOS == "windows" {
+		plat = "windows"
+	}
+
+	isolations := []string{"process", "hyperv"}
+	for _, isolation := range isolations {
+		if plat == "linux" && isolation == "hyperv" {
+			// Combination doesn't make sense.
+			continue
+		}
+
+		bundle, err := os.MkdirTemp("", "TestGenerateValid_bundle")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.RemoveAll(bundle)
+
+		// Create our toy bundle.
+		rootfsPath := filepath.Join(bundle, "rootfs")
+		if err := os.Mkdir(rootfsPath, 0o755); err != nil {
+			t.Fatal(err)
+		}
+		configPath := filepath.Join(bundle, "config.json")
+		g, err := generate.New(plat)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if runtime.GOOS == "windows" {
+			g.AddWindowsLayerFolders("C:\\fakelayer")
+			g.AddWindowsLayerFolders("C:\\fakescratch")
+			if isolation == "process" {
+				// Add the Rootfs section (note: fake volume guid)
+				g.SetRootPath("\\\\?\\Volume{ec84d99e-3f02-11e7-ac6c-00155d7682cf}\\")
+			} else {
+				// Add the Hyper-V section
+				g.SetWindowsHypervUntilityVMPath("")
+			}
+		}
+		if err := (&g).SaveToFile(configPath, generate.ExportOptions{Seccomp: false}); err != nil {
+			t.Fatal(err)
+		}
+
+		// Validate the bundle.
+		v, err := NewValidatorFromPath(bundle, true, runtime.GOOS)
+		if err != nil {
+			t.Errorf("unexpected NewValidatorFromPath error: %+v", err)
+		}
+		if err := v.CheckAll(); err != nil {
+			levelErrors, err := specerror.SplitLevel(err, rfc2119.Must)
+			if err != nil {
+				t.Errorf("unexpected non-multierror: %+v", err)
+				return
+			}
+			for _, e := range levelErrors.Warnings {
+				t.Logf("unexpected warning: %v", e)
+			}
+			if err := levelErrors.Error; err != nil {
+				t.Errorf("unexpected MUST error(s): %+v", err)
+			}
+		}
+	}
+}
+
 func TestNewValidator(t *testing.T) {
 	testSpec := &rspec.Spec{}
 	testBundle := ""