From 2434e56ff514d9af59819b3271a539606d3cd754 Mon Sep 17 00:00:00 2001 From: EduardKaverinskyi Date: Mon, 18 Mar 2024 13:06:42 +0100 Subject: [PATCH 1/9] Add path conversion for addAUT() --- squape/squishserver.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index 538f138..e94b178 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -108,11 +108,12 @@ def addAUT(self, aut: str, path: str) -> None: aut (str): the name of the executable path (str): path to the executable folder """ + path_resolved = Path(path).as_posix() log( f"[Squishserver {self.host}:{self.port}] " - f"Registering {Path(path)/aut} AUT" + f"Registering {path_resolved/aut} AUT" ) - self._config_squishserver("addAUT", [aut, path]) + self._config_squishserver("addAUT", [aut, path_resolved]) def removeAUT(self, aut: str, path: str) -> None: """Remove registered AUT From f6f60a59805d3be692aeab8a3e9ded28dc684165 Mon Sep 17 00:00:00 2001 From: EduardKaverinskyi Date: Mon, 18 Mar 2024 13:35:38 +0100 Subject: [PATCH 2/9] Fix logging resolved path for addAUT --- squape/squishserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index e94b178..1bfb95d 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -111,7 +111,7 @@ def addAUT(self, aut: str, path: str) -> None: path_resolved = Path(path).as_posix() log( f"[Squishserver {self.host}:{self.port}] " - f"Registering {path_resolved/aut} AUT" + f"Registering {path_resolved}/{aut} AUT" ) self._config_squishserver("addAUT", [aut, path_resolved]) From d0c3f240394b1f3781fb416a3597b06e0839ba24 Mon Sep 17 00:00:00 2001 From: EduardKaverinskyi Date: Mon, 18 Mar 2024 13:41:31 +0100 Subject: [PATCH 3/9] Replace Path with PureWindowsPath so it produces correct path on POSIX systems --- squape/squishserver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index 1bfb95d..7a78dbc 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import os from pathlib import Path +from pathlib import PureWindowsPath try: import squish @@ -108,7 +109,7 @@ def addAUT(self, aut: str, path: str) -> None: aut (str): the name of the executable path (str): path to the executable folder """ - path_resolved = Path(path).as_posix() + path_resolved = PureWindowsPath(path).as_posix() log( f"[Squishserver {self.host}:{self.port}] " f"Registering {path_resolved}/{aut} AUT" From 457e3cb94e9d1d5dd51b9374ca12cb07558fb4bb Mon Sep 17 00:00:00 2001 From: EduardKaverinskyi Date: Tue, 19 Mar 2024 15:43:48 +0100 Subject: [PATCH 4/9] Add remotesys.execute handling for Linux --- squape/squishserver.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index 7a78dbc..4ddf4e1 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -90,7 +90,17 @@ def _config_squishserver(self, config_option: str, params=None, cwd=None): f"Executing command: {' '.join(cmd)}", f"cwd: {cwd}", ) - (exitcode, stdout, stderr) = self.remotesys.execute(cmd, cwd) + + remote_os = self.remotesys.getOSName() + if remote_os == "Windows": + (exitcode, stdout, stderr) = self.remotesys.execute(cmd, cwd) + else: + squish_prefix = self.remotesys.getEnvironmentVariable("SQUISH_PREFIX") + cmd_str = squish_prefix + " ".join(cmd) + (exitcode, stdout, stderr) = self.remotesys.execute( + ["sh", "-c", cmd_str], cwd + ) + if exitcode != "0": raise SquishserverError( f"[Squishserver {self.host}:{self.port}] " @@ -109,7 +119,7 @@ def addAUT(self, aut: str, path: str) -> None: aut (str): the name of the executable path (str): path to the executable folder """ - path_resolved = PureWindowsPath(path).as_posix() + path_resolved = PureWindowsPath(path).as_posix().strip() log( f"[Squishserver {self.host}:{self.port}] " f"Registering {path_resolved}/{aut} AUT" From 01715b534944a21a16ec42c62ff289bb85565f82 Mon Sep 17 00:00:00 2001 From: EduardKaverinskyi Date: Tue, 19 Mar 2024 15:48:01 +0100 Subject: [PATCH 5/9] fixup! Add remotesys.execute handling for Linux --- squape/squishserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index 4ddf4e1..3d12286 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -95,7 +95,7 @@ def _config_squishserver(self, config_option: str, params=None, cwd=None): if remote_os == "Windows": (exitcode, stdout, stderr) = self.remotesys.execute(cmd, cwd) else: - squish_prefix = self.remotesys.getEnvironmentVariable("SQUISH_PREFIX") + squish_prefix = self.remotesys.getEnvironmentVariable("SQUISH_PREFIX") + "/" cmd_str = squish_prefix + " ".join(cmd) (exitcode, stdout, stderr) = self.remotesys.execute( ["sh", "-c", cmd_str], cwd From f09a843b5598d4196bcb7daff659b4546f0de1b4 Mon Sep 17 00:00:00 2001 From: EduardKaverinskyi Date: Tue, 19 Mar 2024 15:50:30 +0100 Subject: [PATCH 6/9] Add /bin to the squish_prefix --- squape/squishserver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index 3d12286..09e9055 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -95,8 +95,8 @@ def _config_squishserver(self, config_option: str, params=None, cwd=None): if remote_os == "Windows": (exitcode, stdout, stderr) = self.remotesys.execute(cmd, cwd) else: - squish_prefix = self.remotesys.getEnvironmentVariable("SQUISH_PREFIX") + "/" - cmd_str = squish_prefix + " ".join(cmd) + squish_prefix = self.remotesys.getEnvironmentVariable("SQUISH_PREFIX") + cmd_str = squish_prefix + "/bin/" + " ".join(cmd) (exitcode, stdout, stderr) = self.remotesys.execute( ["sh", "-c", cmd_str], cwd ) From 88e1655cdda0d41e29f2a0ea2ad39aa0f18aa5a5 Mon Sep 17 00:00:00 2001 From: EduardKaverinskyi Date: Tue, 19 Mar 2024 15:54:06 +0100 Subject: [PATCH 7/9] Add PureWindowsPath resolving for the rest of the methods --- squape/squishserver.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index 09e9055..4e325c7 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -145,8 +145,12 @@ def addAppPath(self, path: str) -> None: Args: path (str): the AUT path to register """ - log(f"[Squishserver {self.host}:{self.port}] " f"Registering AUT path: {path}") - self._config_squishserver("addAppPath", [path]) + path_resolved = PureWindowsPath(path).as_posix().strip() + log( + f"[Squishserver {self.host}:{self.port}] " + f"Registering AUT path: {path_resolved}" + ) + self._config_squishserver("addAppPath", [path_resolved]) def removeAppPath(self, path: str) -> None: """Remove a registered AUT path @@ -154,11 +158,12 @@ def removeAppPath(self, path: str) -> None: Args: path (str): the path to the AUT """ + path_resolved = PureWindowsPath(path).as_posix().strip() log( f"[Squishserver {self.host}:{self.port}] " - f"Removing registered AUT path: {path}" + f"Removing registered AUT path: {path_resolved}" ) - self._config_squishserver("removeAppPath", [path]) + self._config_squishserver("removeAppPath", [path_resolved]) def addAttachableAut(self, aut: str, port: int, host: str = "127.0.0.1") -> None: """Register an attachable AUT From aa14be61967f15413ecc605c1e736247634e10c5 Mon Sep 17 00:00:00 2001 From: Eduard <108861789+EduardKaverinskyi@users.noreply.github.com> Date: Thu, 21 Mar 2024 09:57:34 +0100 Subject: [PATCH 8/9] Simplify remote os comparison Co-authored-by: Jakub --- squape/squishserver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index 4e325c7..b92437d 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -91,8 +91,7 @@ def _config_squishserver(self, config_option: str, params=None, cwd=None): f"cwd: {cwd}", ) - remote_os = self.remotesys.getOSName() - if remote_os == "Windows": + if self.remotesys.getOSName() == "Windows": (exitcode, stdout, stderr) = self.remotesys.execute(cmd, cwd) else: squish_prefix = self.remotesys.getEnvironmentVariable("SQUISH_PREFIX") From 7ddc5b560c5e02426c4b0174c3bcb50300d1f862 Mon Sep 17 00:00:00 2001 From: EduardKaverinskyi Date: Thu, 21 Mar 2024 16:03:28 +0100 Subject: [PATCH 9/9] Make cmd_str be build with self.location instead of SQUISH_PREFIX --- squape/squishserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/squape/squishserver.py b/squape/squishserver.py index b92437d..f1ca2b5 100644 --- a/squape/squishserver.py +++ b/squape/squishserver.py @@ -77,7 +77,7 @@ def _config_squishserver(self, config_option: str, params=None, cwd=None): config_option (str): the config option to be used during configuration. params (list, optional): the configuration parameters. Defaults to []. cwd (str): the path to the current working directory. - Defaults to the "SQUISH_PREFIX" environment vairable. + Defaults to the squishserver location. """ if params is None: params = [] @@ -94,8 +94,7 @@ def _config_squishserver(self, config_option: str, params=None, cwd=None): if self.remotesys.getOSName() == "Windows": (exitcode, stdout, stderr) = self.remotesys.execute(cmd, cwd) else: - squish_prefix = self.remotesys.getEnvironmentVariable("SQUISH_PREFIX") - cmd_str = squish_prefix + "/bin/" + " ".join(cmd) + cmd_str = self.location + "/bin/" + " ".join(cmd) (exitcode, stdout, stderr) = self.remotesys.execute( ["sh", "-c", cmd_str], cwd )