Tests: fixed tests to run as privileged user.

2 files changed, 15 insertions, 8 deletions

diff --git a/test/test_python_isolation.py b/test/test_python_isolation.py
index 8cef6812..db398444 100644
--- a/test/test_python_isolation.py
+++ b/test/test_python_isolation.py
@@ -63,24 +63,25 @@ class TestPythonIsolation(TestApplicationPython):
             pytest.skip('requires root')
 
         isolation = {'rootfs': temp_dir, 'automount': {'language_deps': False}}
-
         self.load('empty', isolation=isolation)
 
-        assert findmnt().find(temp_dir) == -1
+        python_path = temp_dir + '/usr'
+
+        assert findmnt().find(python_path) == -1
         assert self.get()['status'] != 200, 'disabled language_deps'
-        assert findmnt().find(temp_dir) == -1
+        assert findmnt().find(python_path) == -1
 
         isolation['automount']['language_deps'] = True
 
         self.load('empty', isolation=isolation)
 
-        assert findmnt().find(temp_dir) == -1
+        assert findmnt().find(python_path) == -1
         assert self.get()['status'] == 200, 'enabled language_deps'
-        assert waitformount(temp_dir), 'language_deps mount'
+        assert waitformount(python_path), 'language_deps mount'
 
         self.conf({"listeners": {}, "applications": {}})
 
-        assert waitforunmount(temp_dir), 'language_deps unmount'
+        assert waitforunmount(python_path), 'language_deps unmount'
 
     def test_python_isolation_procfs(self, is_su, temp_dir):
         if not is_su:
diff --git a/test/unit/utils.py b/test/unit/utils.py
index 43aaa81b..f9e9d08a 100644
--- a/test/unit/utils.py
+++ b/test/unit/utils.py
@@ -12,9 +12,15 @@ def public_dir(path):
 
     for root, dirs, files in os.walk(path):
         for d in dirs:
-            os.chmod(os.path.join(root, d), 0o777)
+            try:
+                os.chmod(os.path.join(root, d), 0o777)
+            except FileNotFoundError:
+                pass
         for f in files:
-            os.chmod(os.path.join(root, f), 0o777)
+            try:
+                os.chmod(os.path.join(root, f), 0o777)
+            except FileNotFoundError:
+                pass
 
 
 def waitforfiles(*files, timeout=50):