rename CheckRootfsPath to CheckRootfs

Signed-off-by: Ma Shimiao <[email protected]>

Author: Ma Shimiao

validate/validate.go

@@ -96,7 +96,7 @@ func NewValidatorFromPath(bundlePath string, hostSpecific bool, platform string)
 // CheckAll checks all parts of runtime bundle
 func (v *Validator) CheckAll() (msgs []string) {
 	msgs = append(msgs, v.CheckPlatform()...)
-	msgs = append(msgs, v.CheckRootfsPath()...)
+	msgs = append(msgs, v.CheckRootfs()...)
 	msgs = append(msgs, v.CheckMandatoryFields()...)
 	msgs = append(msgs, v.CheckSemVer()...)
 	msgs = append(msgs, v.CheckMounts()...)
@@ -109,9 +109,9 @@ func (v *Validator) CheckAll() (msgs []string) {
 	return
 }
 
-// CheckRootfsPath checks status of v.spec.Root.Path
-func (v *Validator) CheckRootfsPath() (msgs []string) {
-	logrus.Debugf("check rootfs path")
+// CheckRootfs checks status of v.spec.Root
+func (v *Validator) CheckRootfs() (msgs []string) {
+	logrus.Debugf("check rootfs")
 
 	absBundlePath, err := filepath.Abs(v.bundlePath)
 	if err != nil {

validate/validate_test.go

@@ -18,21 +18,21 @@ func checkErrors(t *testing.T, title string, msgs []string, valid bool) {
 	}
 }
 
-func TestCheckRootfsPath(t *testing.T) {
+func TestCheckRootfs(t *testing.T) {
 	tmpBundle, err := ioutil.TempDir("", "oci-check-rootfspath")
 	if err != nil {
-		t.Fatalf("Failed to create a TempDir in 'CheckRootfsPath'")
+		t.Fatalf("Failed to create a TempDir in 'CheckRootfs'")
 	}
 	defer os.RemoveAll(tmpBundle)
 
 	rootfsDir := "rootfs"
 	rootfsNonDir := "rootfsfile"
 	rootfsNonExists := "rootfsnil"
 	if err := os.MkdirAll(filepath.Join(tmpBundle, rootfsDir), 0700); err != nil {
-		t.Fatalf("Failed to create a rootfs directory in 'CheckRootfsPath'")
+		t.Fatalf("Failed to create a rootfs directory in 'CheckRootfs'")
 	}
 	if _, err := os.Create(filepath.Join(tmpBundle, rootfsNonDir)); err != nil {
-		t.Fatalf("Failed to create a non-directory rootfs in 'CheckRootfsPath'")
+		t.Fatalf("Failed to create a non-directory rootfs in 'CheckRootfs'")
 	}
 
 	cases := []struct {
@@ -48,7 +48,7 @@ func TestCheckRootfsPath(t *testing.T) {
 	}
 	for _, c := range cases {
 		v := NewValidator(&rspec.Spec{Root: &rspec.Root{Path: c.val}}, tmpBundle, false, "linux")
-		checkErrors(t, "CheckRootfsPath "+c.val, v.CheckRootfsPath(), c.expected)
+		checkErrors(t, "CheckRootfs "+c.val, v.CheckRootfs(), c.expected)
 	}
 }