Add amd64 as a condition for system/os.py to support freebsd x64 arch…

…itecture (#3240) * Add amd64 as a condition for system/os.py to support freebsd x64 architecture Signed-off-by: Peter Zhu <[email protected]> * Tweak test name from x86_64 to amd64 Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Feb 28, 2023 · 76cc42d · 76cc42d
1 parent c0449fe
commit 76cc42d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/system/os.py b/src/system/os.py
@@ -11,7 +11,7 @@
 
 def current_architecture() -> str:
     architecture = subprocess.check_output(["uname", "-m"]).decode().strip()
-    if architecture == "x86_64":
+    if architecture == "x86_64" or architecture == "amd64":
         return "x64"
     elif architecture == "aarch64" or architecture == "arm64":
         return "arm64"

diff --git a/tests/tests_system/test_os.py b/tests/tests_system/test_os.py
@@ -20,6 +20,10 @@ def test_current_architecture(self) -> None:
     def test_x86_64_return_x64_architecture(self, mock_subprocess: MagicMock) -> None:
         self.assertTrue(current_architecture() == "x64")
 
+    @patch("subprocess.check_output", return_value="amd64".encode())
+    def test_amd64_return_x64_architecture(self, mock_subprocess: MagicMock) -> None:
+        self.assertTrue(current_architecture() == "x64")
+
     @patch("subprocess.check_output", return_value="aarch64".encode())
     def test_aarch64_return_arm64_architecture(self, mock_subprocess: MagicMock) -> None:
         self.assertTrue(current_architecture() == "arm64")