Make sure WindowsZip/LinuxTar remove correct dir when uninstall (#4023)

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Sep 15, 2023 · 6e89bdb · 6e89bdb
1 parent 9ff7a9e
commit 6e89bdb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/test_workflow/integ_test/distribution_tar.py b/src/test_workflow/integ_test/distribution_tar.py
@@ -39,5 +39,5 @@ def start_cmd(self) -> str:
         return start_cmd_map[self.filename]
 
     def uninstall(self) -> None:
-        logging.info(f"Cleanup {self.work_dir}/* content after the test")
-        subprocess.check_call(f"rm -rf {self.work_dir}/*", shell=True)
+        logging.info(f"Cleanup {self.install_dir} content after the test")
+        subprocess.check_call(f"rm -rf {self.install_dir}", shell=True)
diff --git a/src/test_workflow/integ_test/distribution_zip.py b/src/test_workflow/integ_test/distribution_zip.py
@@ -39,5 +39,5 @@ def start_cmd(self) -> str:
         return start_cmd_map[self.filename]
 
     def uninstall(self) -> None:
-        logging.info(f"Cleanup {self.work_dir}/* content after the test")
-        subprocess.check_call(f"rm -rf {self.work_dir}/*", shell=True)
+        logging.info(f"Cleanup {self.install_dir} content after the test")
+        subprocess.check_call(f"rm -rf {self.install_dir}", shell=True)
diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_tar.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_tar.py
@@ -54,4 +54,4 @@ def test_uninstall(self, check_call_mock: Mock) -> None:
         args_list = check_call_mock.call_args_list
 
         self.assertEqual(check_call_mock.call_count, 1)
-        self.assertEqual(f"rm -rf {self.work_dir}/*", args_list[0][0][0])
+        self.assertEqual(f"rm -rf {os.path.join(self.work_dir, 'opensearch-1.3.0')}", args_list[0][0][0])
diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_zip.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_zip.py
@@ -55,7 +55,7 @@ def test_uninstall(self, check_call_mock: Mock) -> None:
         args_list = check_call_mock.call_args_list
 
         self.assertEqual(check_call_mock.call_count, 1)
-        self.assertEqual(f"rm -rf {self.work_dir}/*", args_list[0][0][0])
+        self.assertEqual(f"rm -rf {os.path.join(self.work_dir, 'opensearch-2.4.0')}", args_list[0][0][0])
 
 
 class TestDistributionZipOpenSearchDashboards(unittest.TestCase):
@@ -97,4 +97,4 @@ def test_uninstall(self, check_call_mock: Mock) -> None:
         args_list = check_call_mock.call_args_list
 
         self.assertEqual(check_call_mock.call_count, 1)
-        self.assertEqual(f"rm -rf {self.work_dir}/*", args_list[0][0][0])
+        self.assertEqual(f"rm -rf {os.path.join(self.work_dir, 'opensearch-dashboards-2.4.0')}", args_list[0][0][0])