Merge pull request #252 from Mashimiao/runtime-test-split-process-validation

runtimetest: split linux specified part of process validation

Author: Mrunal Patel

cmd/runtimetest/main.go

@@ -63,8 +63,36 @@ func loadSpecConfig() (spec *rspec.Spec, err error) {
 	return spec, nil
 }
 
-func validateProcess(spec *rspec.Spec) error {
+// should be included by other platform specified process validation
+func validateGeneralProcess(spec *rspec.Spec) error {
+	if spec.Process.Cwd != "" {
+		cwd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+		if cwd != spec.Process.Cwd {
+			return fmt.Errorf("Cwd expected: %v, actual: %v", spec.Process.Cwd, cwd)
+		}
+	}
+
+	for _, env := range spec.Process.Env {
+		parts := strings.Split(env, "=")
+		key := parts[0]
+		expectedValue := parts[1]
+		actualValue := os.Getenv(key)
+		if actualValue != expectedValue {
+			return fmt.Errorf("Env %v expected: %v, actual: %v", key, expectedValue, actualValue)
+		}
+	}
+
+	return nil
+}
+
+func validateLinuxProcess(spec *rspec.Spec) error {
 	logrus.Debugf("validating container process")
+
+	validateGeneralProcess(spec)
+
 	uid := os.Getuid()
 	if uint32(uid) != spec.Process.User.UID {
 		return fmt.Errorf("UID expected: %v, actual: %v", spec.Process.User.UID, uid)
@@ -90,16 +118,6 @@ func validateProcess(spec *rspec.Spec) error {
 		}
 	}
 
-	if spec.Process.Cwd != "" {
-		cwd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-		if cwd != spec.Process.Cwd {
-			return fmt.Errorf("Cwd expected: %v, actual: %v", spec.Process.Cwd, cwd)
-		}
-	}
-
 	cmdlineBytes, err := ioutil.ReadFile("/proc/1/cmdline")
 	if err != nil {
 		return err
@@ -115,16 +133,6 @@ func validateProcess(spec *rspec.Spec) error {
 		}
 	}
 
-	for _, env := range spec.Process.Env {
-		parts := strings.Split(env, "=")
-		key := parts[0]
-		expectedValue := parts[1]
-		actualValue := os.Getenv(key)
-		if actualValue != expectedValue {
-			return fmt.Errorf("Env %v expected: %v, actual: %v", key, expectedValue, actualValue)
-		}
-	}
-
 	ret, _, errno := syscall.Syscall6(syscall.SYS_PRCTL, PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0, 0)
 	if errno != 0 {
 		return errno
@@ -548,7 +556,6 @@ func validate(context *cli.Context) error {
 
 	defaultValidations := []validation{
 		validateRootFS,
-		validateProcess,
 		validateHostname,
 		validateMountsExist,
 	}
@@ -558,6 +565,7 @@ func validate(context *cli.Context) error {
 		validateDefaultFS,
 		validateDefaultDevices,
 		validateLinuxDevices,
+		validateLinuxProcess,
 		validateMaskedPaths,
 		validateOOMScoreAdj,
 		validateROPaths,