Fix: retry command substitution. (#804)

Signed-off-by: dblock <dblock@dblock.org>
opensearch-project · Oct 26, 2021 · d7ae0bf · d7ae0bf
1 parent f7f9d00
commit d7ae0bf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/build_workflow/build_args.py b/src/build_workflow/build_args.py
@@ -6,7 +6,6 @@
 
 import argparse
 import logging
-import os
 import sys
 
 
@@ -76,7 +75,7 @@ def __init__(self):
         self.keep = args.keep
         self.platform = args.platform
         self.architecture = args.architecture
-        self.script_path = sys.argv[0].replace(os.path.sep + os.path.join("src", "run_build.py"), f"{os.path.sep}build.sh")
+        self.script_path = sys.argv[0].replace("/src/run_build.py", "/build.sh")
 
     def component_command(self, name):
         return " ".join(

diff --git a/src/ci_workflow/ci_args.py b/src/ci_workflow/ci_args.py
@@ -6,7 +6,6 @@
 
 import argparse
 import logging
-import os
 import sys
 
 
@@ -46,7 +45,7 @@ def __init__(self):
         self.component = args.component
         self.keep = args.keep
         self.logging_level = args.logging_level
-        self.script_path = sys.argv[0].replace(os.path.sep + os.path.join("src", "run_ci.py"), f"{os.path.sep}ci.sh")
+        self.script_path = sys.argv[0].replace("/src/run_ci.py", "/ci.sh")
 
     def component_command(self, name):
         return " ".join(

diff --git a/tests/tests_build_workflow/test_build_args.py b/tests/tests_build_workflow/test_build_args.py
@@ -14,9 +14,9 @@
 
 class TestBuildArgs(unittest.TestCase):
 
-    BUILD_PY = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "src", "run_build.py"))
+    BUILD_PY = "./src/run_build.py"
 
-    BUILD_SH = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "build.sh"))
+    BUILD_SH = "./build.sh"
 
     OPENSEARCH_MANIFEST = os.path.realpath(
         os.path.join(
@@ -83,8 +83,6 @@ def test_architecture(self):
 
     @patch("argparse._sys.argv", [BUILD_PY, OPENSEARCH_MANIFEST, "--component", "xyz"])
     def test_script_path(self):
-        self.assertTrue(os.path.isfile(self.BUILD_PY))
-        self.assertTrue(os.path.isfile(self.BUILD_SH))
         self.assertEqual(BuildArgs().script_path, self.BUILD_SH)
 
     @patch("argparse._sys.argv", [BUILD_PY, OPENSEARCH_MANIFEST])

diff --git a/tests/tests_ci_workflow/test_ci_args.py b/tests/tests_ci_workflow/test_ci_args.py
@@ -13,9 +13,9 @@
 
 class TestCiArgs(unittest.TestCase):
 
-    CI_PY = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "src", "run_ci.py"))
+    CI_PY = "./src/run_ci.py"
 
-    CI_SH = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "ci.sh"))
+    CI_SH = "./ci.sh"
 
     OPENSEARCH_MANIFEST = os.path.realpath(
         os.path.join(
@@ -58,8 +58,6 @@ def test_component(self):
 
     @patch("argparse._sys.argv", [CI_PY, OPENSEARCH_MANIFEST, "--component", "xyz"])
     def test_script_path(self):
-        self.assertTrue(os.path.isfile(self.CI_PY))
-        self.assertTrue(os.path.isfile(self.CI_SH))
         self.assertEqual(CiArgs().script_path, self.CI_SH)
 
     @patch("argparse._sys.argv", [CI_PY, OPENSEARCH_MANIFEST])