diff options
| author | Alex Solomes <alex.solomes@softwareag.com> | 2022-02-17 14:48:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 14:48:48 +0000 |
| commit | 41c4d08331c35ebfa54d6c5c7495c95f892b60c1 (patch) | |
| tree | 4440aec556c45c27bf1d144941e0355ea3eb49df /tests | |
| parent | 144cc7e21c304419a3e583f0c06bd453b71823da (diff) | |
| parent | ad4b056df2b344115b2a6ba5d891ca7f927963b3 (diff) | |
Merge pull request #793 from initard/bugfix/tmppath
renamed download.path to tmp.path in tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PySys/software_management_end_to_end/sm_apt_install_download_path/run.py | 4 | ||||
| -rw-r--r-- | tests/PySys/tedge/tedge_software_update/run.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/PySys/software_management_end_to_end/sm_apt_install_download_path/run.py b/tests/PySys/software_management_end_to_end/sm_apt_install_download_path/run.py index 66cd4991..4c5137ab 100644 --- a/tests/PySys/software_management_end_to_end/sm_apt_install_download_path/run.py +++ b/tests/PySys/software_management_end_to_end/sm_apt_install_download_path/run.py @@ -41,7 +41,7 @@ class AptInstallWithDownloadPath(SoftwareManagement, TedgeEnvironment): def set_download_path(self, download_path): self.startProcess( command=self.SUDO, - arguments=[self.TEDGE, "config", "set", "download.path", f"{download_path}"] + arguments=[self.TEDGE, "config", "set", "tmp.path", f"{download_path}"] ) def setup(self): @@ -52,7 +52,7 @@ class AptInstallWithDownloadPath(SoftwareManagement, TedgeEnvironment): self.startProcess(command=self.SUDO, arguments=["mkdir", f"{self.DOWNLOAD_DIR}"]) self.startProcess(command=self.SUDO, arguments=["chmod", "a+rwx", f"{self.DOWNLOAD_DIR}"]) - self.CURRENT_DOWNLOAD_PATH = subprocess.check_output(f"{self.SUDO} {self.TEDGE} config get download.path", shell=True).decode("utf8").strip() + self.CURRENT_DOWNLOAD_PATH = subprocess.check_output(f"{self.SUDO} {self.TEDGE} config get tmp.path", shell=True).decode("utf8").strip() # setting download.path self.set_download_path(self.DOWNLOAD_DIR) diff --git a/tests/PySys/tedge/tedge_software_update/run.py b/tests/PySys/tedge/tedge_software_update/run.py index f84abb85..5c6cd0a4 100644 --- a/tests/PySys/tedge/tedge_software_update/run.py +++ b/tests/PySys/tedge/tedge_software_update/run.py @@ -1,4 +1,4 @@ -from .environments.environment_c8y import EnvironmentC8y +from environments.environment_c8y import EnvironmentC8y """ Validate command line option help @@ -13,7 +13,7 @@ Then we find the string SUBCOMMANDS: in the output TEDGE_DOWNLOAD_DIR = "/tedge_download_dir" TEDGE_DOWNLOAD_PATH = "tmp.path" TOPIC = 'tedge/commands/req/software/update' -PAYLOAD = '{"id":"1234","updateList":[{"type":"apt","modules":[{"name":"rolldice","version":"::apt","url":"https://t48415.basic.stage.c8y.io/inventory/binaries/1202","action":"install"}]}]}' +PAYLOAD = '{"id":"1234","updateList":[{"type":"apt","modules":[{"name":"rolldice","version":"::apt","url":"{}/inventory/binaries/11643549","action":"install"}]}]}' class PySysTest(EnvironmentC8y): @@ -82,7 +82,7 @@ class PySysTest(EnvironmentC8y): # 4. trigger rolldice download _ = self.startProcess( command=self.sudo, - arguments=[self.tedge, "mqtt", "pub", TOPIC, PAYLOAD], + arguments=[self.tedge, "mqtt", "pub", TOPIC, PAYLOAD.format(self.project.c8yurl)], stdouterr="rolldice_download", expectedExitStatus="==0", ) |