From 5930a422d7cf31b96ae465e7bd89b528712e676f Mon Sep 17 00:00:00 2001 From: Marek Fiala Date: Mon, 16 Dec 2024 10:20:24 +0100 Subject: [PATCH] fix(tools): Fixed timeout and path bug for test_cli_installer_win --- .gitlab/ci/test-win.yml | 1 + tools/test_idf_tools/test_idf_tools.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/test-win.yml b/.gitlab/ci/test-win.yml index 42e2446933..3b8d3d1807 100644 --- a/.gitlab/ci/test-win.yml +++ b/.gitlab/ci/test-win.yml @@ -29,6 +29,7 @@ test_cli_installer_win: expire_in: 1 week variables: IDF_PATH: "$CI_PROJECT_DIR" + timeout: 3h script: # Tools must be downloaded for testing - python ${IDF_PATH}\tools\idf_tools.py download required qemu-riscv32 qemu-xtensa cmake diff --git a/tools/test_idf_tools/test_idf_tools.py b/tools/test_idf_tools/test_idf_tools.py index 87eab1dee0..00a82635d3 100755 --- a/tools/test_idf_tools/test_idf_tools.py +++ b/tools/test_idf_tools/test_idf_tools.py @@ -322,8 +322,9 @@ class TestUsage(TestUsageBase): self.run_idf_tools_with_action(['install', OPENOCD]) output = self.run_idf_tools_with_action(['export']) - self.assertIn('%s/tools/openocd-esp32/%s/openocd-esp32/bin' % - (self.temp_tools_dir, OPENOCD_VERSION), output) + self.assertIn(os.path.join( + self.temp_tools_dir, 'tools', 'openocd-esp32', OPENOCD_VERSION, 'openocd-esp32', 'bin' + ), output) # TestUsageUnix tests installed tools on UNIX platforms