Merge pull request #5971 from giuseppe/fix-userns-tests

v2, podman: fix and enable all run_userns_test.go tests

1 files changed, 6 insertions, 1 deletions

diff --git a/pkg/namespaces/namespaces.go b/pkg/namespaces/namespaces.go
index 2cb3c3f20..2ffbde977 100644
--- a/pkg/namespaces/namespaces.go
+++ b/pkg/namespaces/namespaces.go
@@ -31,7 +31,7 @@ func (n CgroupMode) IsHost() bool {
 
 // IsDefaultValue indicates whether the cgroup namespace has the default value.
 func (n CgroupMode) IsDefaultValue() bool {
-	return n == ""
+	return n == "" || n == defaultType
 }
 
 // IsNS indicates a cgroup namespace passed in by path (ns:<path>)
@@ -102,6 +102,11 @@ func (n UsernsMode) IsAuto() bool {
 	return parts[0] == "auto"
 }
 
+// IsDefaultValue indicates whether the user namespace has the default value.
+func (n UsernsMode) IsDefaultValue() bool {
+	return n == "" || n == defaultType
+}
+
 // GetAutoOptions returns a AutoUserNsOptions with the settings to setup automatically
 // a user namespace.
 func (n UsernsMode) GetAutoOptions() (*storage.AutoUserNsOptions, error) {