Merged with the default branch.1.26.0-1

1 files changed, 5 insertions, 10 deletions

diff --git a/test/test_java_isolation_rootfs.py b/test/test_java_isolation_rootfs.py
index a401e23b..eac86a0c 100644
--- a/test/test_java_isolation_rootfs.py
+++ b/test/test_java_isolation_rootfs.py
@@ -2,7 +2,6 @@ import os
 import subprocess
 
 import pytest
-
 from unit.applications.lang.java import TestApplicationJava
 from unit.option import option
 
@@ -19,7 +18,7 @@ class TestJavaIsolationRootfs(TestApplicationJava):
         os.chmod(option.temp_dir + '/tmp', 0o777)
 
         try:
-            process = subprocess.Popen(
+            subprocess.run(
                 [
                     "mount",
                     "--bind",
@@ -29,12 +28,10 @@ class TestJavaIsolationRootfs(TestApplicationJava):
                 stderr=subprocess.STDOUT,
             )
 
-            process.communicate()
-
         except KeyboardInterrupt:
             raise
 
-        except:
+        except subprocess.CalledProcessError:
             pytest.fail('Can\'t run mount process.')
 
     def teardown_method(self, is_su):
@@ -42,18 +39,16 @@ class TestJavaIsolationRootfs(TestApplicationJava):
             return
 
         try:
-            process = subprocess.Popen(
+            subprocess.run(
                 ["umount", "--lazy", option.temp_dir + "/jars"],
                 stderr=subprocess.STDOUT,
             )
 
-            process.communicate()
-
         except KeyboardInterrupt:
             raise
 
-        except:
-            pytest.fail('Can\'t run mount process.')
+        except subprocess.CalledProcessError:
+            pytest.fail('Can\'t run umount process.')
 
     def test_java_isolation_rootfs_chroot_war(self, is_su, temp_dir):
         if not is_su: