RootFul/RootLess > Rootful/Rootless

Signed-off-by: apostasie <[email protected]>

Author: apostasie

cmd/nerdctl/image/image_convert_linux_test.go

@@ -108,7 +108,7 @@ func TestImageConvertNydusVerify(t *testing.T) {
 			test.Binary("nydusify"),
 			test.Binary("nydusd"),
 			test.Not(nerdtest.Docker),
-			nerdtest.RootFul,
+			nerdtest.Rootful,
 		),
 		Setup: func(data test.Data, helpers test.Helpers) {
 			helpers.Ensure("pull", testutil.CommonImage)

cmd/nerdctl/network/network_remove_linux_test.go

@@ -31,7 +31,7 @@ import (
 func TestNetworkRemove(t *testing.T) {
 	testCase := nerdtest.Setup()
 
-	testCase.Require = nerdtest.RootFul
+	testCase.Require = nerdtest.Rootful
 
 	testCase.SubTests = []*test.Case{
 		{

docs/testing/tools.md

@@ -385,7 +385,7 @@ nerdtest.Docker // a test only run on Docker - normally used with test.Not(nerdt
 nerdtest.Soci // a test requires the soci snapshotter
 nerdtest.Stargz // a test requires the stargz snapshotter
 nerdtest.Rootless // a test requires Rootless
-nerdtest.RootFul // a test requires Rootful
+nerdtest.Rootful // a test requires Rootful
 nerdtest.Build // a test requires buildkit
 nerdtest.CGroup // a test requires cgroup
 nerdtest.NerdctlNeedsFixing // indicates that a test cannot be run on nerdctl yet as a fix is required

pkg/testutil/nerdtest/requirements.go

@@ -131,8 +131,8 @@ var BrokenTest = func(message string, req *test.Requirement) *test.Requirement {
 	}
 }
 
-// RootLess marks a test as suitable only for the rootless environment
-var RootLess = &test.Requirement{
+// Rootless marks a test as suitable only for the rootless environment
+var Rootless = &test.Requirement{
 	Check: func(data test.Data, helpers test.Helpers) (ret bool, mess string) {
 		// Make sure we DO not return "IsRootless true" for docker
 		ret = getTarget() == targetNerdctl && rootlessutil.IsRootless()
@@ -145,8 +145,8 @@ var RootLess = &test.Requirement{
 	},
 }
 
-// RootFul marks a test as suitable only for rootful env
-var RootFul = test.Not(RootLess)
+// Rootful marks a test as suitable only for rootful env
+var Rootful = test.Not(Rootless)
 
 // CGroup requires that cgroup is enabled
 var CGroup = &test.Requirement{