add preFunc

With preFunc, we can build test envirionment before container runc

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>

Author: Ma Shimiao

validation/validation_test.go

@@ -22,6 +22,9 @@ var (
 	runtimeCommand = "runc"
 )
 
+// build test environment before running container
+type preFunc func(string) error
+
 func init() {
 	runtimeInEnv := os.Getenv("RUNTIME")
 	if runtimeInEnv != "" {
@@ -54,11 +57,18 @@ func getDefaultGenerator() *generate.Generator {
 	return &g
 }
 
-func runtimeInsideValidate(g *generate.Generator) error {
+func runtimeInsideValidate(g *generate.Generator, f preFunc) error {
 	bundleDir, err := prepareBundle()
 	if err != nil {
 		return err
 	}
+
+	if f != nil {
+		if err := f(bundleDir); err != nil {
+			return err
+		}
+	}
+
 	r, err := NewRuntime(runtimeCommand, bundleDir)
 	if err != nil {
 		os.RemoveAll(bundleDir)
@@ -85,15 +95,15 @@ func runtimeInsideValidate(g *generate.Generator) error {
 func TestValidateBasic(t *testing.T) {
 	g := getDefaultGenerator()
 
-	assert.Nil(t, runtimeInsideValidate(g))
+	assert.Nil(t, runtimeInsideValidate(g, nil))
 }
 
 // Test whether rootfs Readonly can be applied as false
 func TestValidateRootFSReadWrite(t *testing.T) {
 	g := getDefaultGenerator()
 	g.SetRootReadonly(false)
 
-	assert.Nil(t, runtimeInsideValidate(g))
+	assert.Nil(t, runtimeInsideValidate(g, nil))
 }
 
 // Test whether rootfs Readonly can be applied as true
@@ -105,15 +115,15 @@ func TestValidateRootFSReadonly(t *testing.T) {
 	g := getDefaultGenerator()
 	g.SetRootReadonly(true)
 
-	assert.Nil(t, runtimeInsideValidate(g))
+	assert.Nil(t, runtimeInsideValidate(g, nil))
 }
 
 // Test whether hostname can be applied or not
 func TestValidateHostname(t *testing.T) {
 	g := getDefaultGenerator()
 	g.SetHostname("hostname-specific")
 
-	assert.Nil(t, runtimeInsideValidate(g))
+	assert.Nil(t, runtimeInsideValidate(g, nil))
 }
 
 func TestValidateRootfsPropagationPrivate(t *testing.T) {
@@ -129,15 +139,15 @@ func TestValidateRootfsPropagationShared(t *testing.T) {
 	g.SetupPrivileged(true)
 	g.SetLinuxRootPropagation("shared")
 
-	assert.Nil(t, runtimeInsideValidate(g))
+	assert.Nil(t, runtimeInsideValidate(g, nil))
 }
 
 func TestValidateRootfsPropagationUnbindable(t *testing.T) {
 	g := getDefaultGenerator()
 	g.SetupPrivileged(true)
 	g.SetLinuxRootPropagation("unbindable")
 
-	assert.Nil(t, runtimeInsideValidate(g))
+	assert.Nil(t, runtimeInsideValidate(g, nil))
 }
 
 // Test whether mounts are correctly mounted
@@ -151,15 +161,15 @@ func TestValidateRlimits(t *testing.T) {
 	g := getDefaultGenerator()
 	g.AddProcessRlimits("RLIMIT_NOFILE", 1024, 1024)
 
-	assert.Nil(t, runtimeInsideValidate(g))
+	assert.Nil(t, runtimeInsideValidate(g, nil))
 }
 
 // Test whether sysctls can be applied or not
 func TestValidateSysctls(t *testing.T) {
 	g := getDefaultGenerator()
 	g.AddLinuxSysctl("net.ipv4.ip_forward", "1")
 
-	assert.Nil(t, runtimeInsideValidate(g))
+	assert.Nil(t, runtimeInsideValidate(g, nil))
 }
 
 // Test Create operation