Merged with the default branch.1.21.0-1

1 files changed, 15 insertions, 14 deletions

diff --git a/test/test_java_isolation_rootfs.py b/test/test_java_isolation_rootfs.py
index f0f04df1..02d35a62 100644
--- a/test/test_java_isolation_rootfs.py
+++ b/test/test_java_isolation_rootfs.py
@@ -11,14 +11,12 @@ class TestJavaIsolationRootfs(TestApplicationJava):
     prerequisites = {'modules': {'java': 'all'}}
 
     def setup_method(self, is_su):
-        super().setup_method()
-
         if not is_su:
             return
 
-        os.makedirs(self.temp_dir + '/jars')
-        os.makedirs(self.temp_dir + '/tmp')
-        os.chmod(self.temp_dir + '/tmp', 0o777)
+        os.makedirs(option.temp_dir + '/jars')
+        os.makedirs(option.temp_dir + '/tmp')
+        os.chmod(option.temp_dir + '/tmp', 0o777)
 
         try:
             process = subprocess.Popen(
@@ -26,15 +24,18 @@ class TestJavaIsolationRootfs(TestApplicationJava):
                     "mount",
                     "--bind",
                     option.current_dir + "/build",
-                    self.temp_dir + "/jars",
+                    option.temp_dir + "/jars",
                 ],
                 stderr=subprocess.STDOUT,
             )
 
             process.communicate()
 
+        except KeyboardInterrupt:
+            raise
+
         except:
-            pytest.fail('Cann\'t run mount process.')
+            pytest.fail('Can\'t run mount process.')
 
     def teardown_method(self, is_su):
         if not is_su:
@@ -42,24 +43,24 @@ class TestJavaIsolationRootfs(TestApplicationJava):
 
         try:
             process = subprocess.Popen(
-                ["umount", "--lazy", self.temp_dir + "/jars"],
+                ["umount", "--lazy", option.temp_dir + "/jars"],
                 stderr=subprocess.STDOUT,
             )
 
             process.communicate()
 
-        except:
-            pytest.fail('Cann\'t run mount process.')
+        except KeyboardInterrupt:
+            raise
 
-        # super teardown must happen after unmount to avoid deletion of /build
-        super().teardown_method()
+        except:
+            pytest.fail('Can\'t run mount process.')
 
-    def test_java_isolation_rootfs_chroot_war(self, is_su):
+    def test_java_isolation_rootfs_chroot_war(self, is_su, temp_dir):
         if not is_su:
             pytest.skip('require root')
 
         isolation = {
-            'rootfs': self.temp_dir,
+            'rootfs': temp_dir,
         }
 
         self.load('empty_war', isolation=isolation)