Merged with the default branch.

1 files changed, 13 insertions, 29 deletions

diff --git a/test/test_go_isolation.py b/test/test_go_isolation.py
index 8c4a6b9c..e8fa26c6 100644
--- a/test/test_go_isolation.py
+++ b/test/test_go_isolation.py
@@ -1,35 +1,15 @@
 import grp
 import os
 import pwd
-import shutil
 
 import pytest
-
-from conftest import option
-from conftest import unit_run
-from conftest import unit_stop
 from unit.applications.lang.go import TestApplicationGo
-from unit.feature.isolation import TestFeatureIsolation
+from unit.option import option
+from unit.utils import getns
 
 class TestGoIsolation(TestApplicationGo):
     prerequisites = {'modules': {'go': 'any'}, 'features': ['isolation']}
 
-    isolation = TestFeatureIsolation()
-
-    @classmethod
-    def setup_class(cls, complete_check=True):
-        check = super().setup_class(complete_check=False)
-
-        unit = unit_run()
-        option.temp_dir = unit['temp_dir']
-
-        TestFeatureIsolation().check(option.available, unit['temp_dir'])
-
-        assert unit_stop() is None
-        shutil.rmtree(unit['temp_dir'])
-
-        return check if not complete_check else check()
-
     def unpriv_creds(self):
         nobody_uid = pwd.getpwnam('nobody').pw_uid
 
@@ -219,8 +199,8 @@ class TestGoIsolation(TestApplicationGo):
                     == option.available['features']['isolation'][ns]
                 ), ('%s match' % ns)
 
-        assert obj['NS']['MNT'] != self.isolation.getns('mnt'), 'mnt set'
-        assert obj['NS']['USER'] != self.isolation.getns('user'), 'user set'
+        assert obj['NS']['MNT'] != getns('mnt'), 'mnt set'
+        assert obj['NS']['USER'] != getns('user'), 'user set'
 
     def test_isolation_pid(self, is_su):
         if not self.isolation_key('pid'):
@@ -360,16 +340,20 @@ class TestGoIsolation(TestApplicationGo):
                 'pid': True
             }
 
+        isolation['automount'] = {
+            'tmpfs': False
+        }
+
         self.load('ns_inspect', isolation=isolation)
 
         obj = self.getjson(url='/?mounts=true')['body']
 
         assert (
-            "/ /tmp" in obj['Mounts'] and "tmpfs" in obj['Mounts']
-        ), 'app has /tmp mounted on /'
+            "/ /tmp" not in obj['Mounts'] and "tmpfs" not in obj['Mounts']
+        ), 'app has no /tmp mounted'
 
         isolation['automount'] = {
-            'tmpfs': False
+            'tmpfs': True
         }
 
         self.load('ns_inspect', isolation=isolation)
@@ -377,5 +361,5 @@ class TestGoIsolation(TestApplicationGo):
         obj = self.getjson(url='/?mounts=true')['body']
 
         assert (
-            "/ /tmp" not in obj['Mounts'] and "tmpfs" not in obj['Mounts']
-        ), 'app has no /tmp mounted'
+            "/ /tmp" in obj['Mounts'] and "tmpfs" in obj['Mounts']
+        ), 'app has /tmp mounted on /'