Merged with the default branch.1.31.0-1

1 files changed, 18 insertions, 19 deletions

diff --git a/test/unit/check/isolation.py b/test/unit/check/isolation.py
index 4ebce893..e4674f4d 100644
--- a/test/unit/check/isolation.py
+++ b/test/unit/check/isolation.py
@@ -1,25 +1,24 @@
 import json
 import os
 
-from unit.applications.lang.go import TestApplicationGo
-from unit.applications.lang.java import TestApplicationJava
-from unit.applications.lang.node import TestApplicationNode
-from unit.applications.lang.ruby import TestApplicationRuby
-from unit.http import TestHTTP
+from unit.applications.lang.go import ApplicationGo
+from unit.applications.lang.java import ApplicationJava
+from unit.applications.lang.node import ApplicationNode
+from unit.applications.lang.ruby import ApplicationRuby
+from unit.http import HTTP1
 from unit.option import option
 from unit.utils import getns
 
 allns = ['pid', 'mnt', 'ipc', 'uts', 'cgroup', 'net']
-http = TestHTTP()
+http = HTTP1()
 
 
 def check_isolation():
-    test_conf = {"namespaces": {"credential": True}}
     available = option.available
 
     conf = ''
     if 'go' in available['modules']:
-        TestApplicationGo().prepare_env('empty', 'app')
+        ApplicationGo().prepare_env('empty', 'app')
 
         conf = {
             "listeners": {"*:7080": {"pass": "applications/empty"}},
@@ -65,7 +64,7 @@ def check_isolation():
         }
 
     elif 'ruby' in available['modules']:
-        TestApplicationRuby().prepare_env('empty')
+        ApplicationRuby().prepare_env('empty')
 
         conf = {
             "listeners": {"*:7080": {"pass": "applications/empty"}},
@@ -81,7 +80,7 @@ def check_isolation():
         }
 
     elif 'java' in available['modules']:
-        TestApplicationJava().prepare_env('empty')
+        ApplicationJava().prepare_env('empty')
 
         conf = {
             "listeners": {"*:7080": {"pass": "applications/empty"}},
@@ -98,7 +97,7 @@ def check_isolation():
         }
 
     elif 'node' in available['modules']:
-        TestApplicationNode().prepare_env('basic')
+        ApplicationNode().prepare_env('basic')
 
         conf = {
             "listeners": {"*:7080": {"pass": "applications/basic"}},
@@ -128,7 +127,7 @@ def check_isolation():
         }
 
     else:
-        return
+        return False
 
     resp = http.put(
         url='/config',
@@ -138,23 +137,23 @@ def check_isolation():
     )
 
     if 'success' not in resp['body']:
-        return
+        return False
 
     userns = getns('user')
     if not userns:
-        return
+        return False
 
-    available['features']['isolation'] = {'user': userns}
+    isolation = {'user': userns}
 
     unp_clone_path = '/proc/sys/kernel/unprivileged_userns_clone'
     if os.path.exists(unp_clone_path):
         with open(unp_clone_path, 'r') as f:
             if str(f.read()).rstrip() == '1':
-                available['features']['isolation'][
-                    'unprivileged_userns_clone'
-                ] = True
+                isolation['unprivileged_userns_clone'] = True
 
     for ns in allns:
         ns_value = getns(ns)
         if ns_value:
-            available['features']['isolation'][ns] = ns_value
+            isolation[ns] = ns_value
+
+    return isolation