echo: fix regression issue when use single quotes in file

microsoft · Aug 13, 2024 · 538216e · 538216e
1 parent 660c472
commit 538216e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lisa/tools/echo.py b/lisa/tools/echo.py
@@ -34,7 +34,7 @@ def write_to_file(
         if append:
             operator = ">>"
         result = self.run(
-            f"'{value}' {operator} '{file}'",
+            f'"{value}" {operator} "{file}"',
             force_run=True,
             shell=True,
             sudo=sudo,

diff --git a/lisa/tools/ssh.py b/lisa/tools/ssh.py
@@ -33,15 +33,15 @@ def generate_key_pairs(self) -> str:
         )
         cat = self.node.tools[Cat]
         public_key = cat.read(
-            str(self.node.get_pure_path("~/.ssh/id_rsa.pub")),
+            str(self.node.get_pure_path("$HOME/.ssh/id_rsa.pub")),
             force_run=True,
         )
         return public_key
 
     def enable_public_key(self, public_key: str) -> None:
         self.node.tools[Echo].write_to_file(
             public_key,
-            self.node.get_pure_path("~/.ssh/authorized_keys"),
+            self.node.get_pure_path("$HOME/.ssh/authorized_keys"),
             append=True,
         )
 

diff --git a/microsoft/testsuites/network/common.py b/microsoft/testsuites/network/common.py
@@ -166,7 +166,7 @@ def sriov_vf_connection_test(
 
         # copy 200 Mb file from source ip to dest ip
         source_node.execute(
-            f"scp -o BindAddress={source_ip} -i ~/.ssh/id_rsa -o"
+            f"scp -o BindAddress={source_ip} -i $HOME/.ssh/id_rsa -o"
             f" StrictHostKeyChecking=no large_file "
             f"$USER@{dest_ip}:/tmp/large_file",
             shell=True,