From bf5b24f2590797a89de58d515353303edcaf4711 Mon Sep 17 00:00:00 2001
From: Fabricio-ESP <fabricio.ribeiro@espressif.com>
Date: Fri, 22 Nov 2024 14:53:21 +0000
Subject: [PATCH] Minor adjustments on ci workflow

---
 .github/workflows/test.yml                      | 4 ++++
 tests/run_pre_test.ps1                          | 2 +-
 tests/runs/CNmirrors2.test.js                   | 2 +-
 tests/script/installNonInteractive.test.js      | 2 +-
 tests/script/postInstall.test.js                | 2 +-
 tests/script/prerequisitesInstallRunner.test.js | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9261d51..1fc406c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -149,8 +149,12 @@ jobs:
                   name: test-results-${{ matrix.package_name }}-${{matrix.run_on}}.zip
                   path: |
                       ./tests/results-pre-test.xml
+                      ./tests/results-pre-install-test.xml
                       ./tests/results-default-test.xml
                       ./tests/results-variation1-test.xml
+                      ./tests/results-non-interactive-test.xml
+                      ./tests/results-CNMirror-test.xml
+                      ./tests/results-CNMirror2-test.xml
                       ./tests/test.log
 
     publish-test-results:
diff --git a/tests/run_pre_test.ps1 b/tests/run_pre_test.ps1
index 96fb230..50b0c3a 100644
--- a/tests/run_pre_test.ps1
+++ b/tests/run_pre_test.ps1
@@ -23,4 +23,4 @@ Expand-Archive node_modules.zip
 
 # Run tests using npm run AllTest
 npm run pre-test
-npm run pre-install
\ No newline at end of file
+# npm run pre-install
\ No newline at end of file
diff --git a/tests/runs/CNmirrors2.test.js b/tests/runs/CNmirrors2.test.js
index 61c2211..f56bbd1 100644
--- a/tests/runs/CNmirrors2.test.js
+++ b/tests/runs/CNmirrors2.test.js
@@ -24,7 +24,7 @@ if (process.env.EIM_FILE_PATH) {
     pathToEim = path.join(os.homedir(), "eim-cli/eim");
 }
 
-logger.debug(`Starting installation using alternative download mirrors`);
+logger.debug(`Starting installation using mirror jihulab and dl.espressif.cn`);
 
 const targetList = ["esp32"]; // targets used for IDF installation
 const idfVersionList = ["v5.0.7"]; // IDF versions to be installed
diff --git a/tests/script/installNonInteractive.test.js b/tests/script/installNonInteractive.test.js
index c61daab..1b88f0b 100644
--- a/tests/script/installNonInteractive.test.js
+++ b/tests/script/installNonInteractive.test.js
@@ -43,7 +43,7 @@ export function runInstallNonInteractive(pathToEim, args = []) {
 
         it("Should install IDF using specified parameters", async function () {
             logger.info("Sent command line for IDF installation");
-            testRunner.sendInput(`${pathToEim} ${args.join(" ")} -n true \r`);
+            testRunner.sendInput(`${pathToEim} ${args.join(" ")} -n true\r`);
 
             const installationSuccessful = await testRunner.waitForOutput(
                 "Successfully installed IDF",
diff --git a/tests/script/postInstall.test.js b/tests/script/postInstall.test.js
index 03c4513..2c5542c 100644
--- a/tests/script/postInstall.test.js
+++ b/tests/script/postInstall.test.js
@@ -27,7 +27,7 @@ export function runPostInstallTest(
                 logger.info("Error to start IDF terminal");
                 logger.info(testRunner.output);
                 throw new Error(
-                    "One test in teh chain failed, aborting the entire suite."
+                    "One test in the chain failed, aborting the entire suite."
                 );
             }
         });
diff --git a/tests/script/prerequisitesInstallRunner.test.js b/tests/script/prerequisitesInstallRunner.test.js
index 3c5eb61..d12a51b 100644
--- a/tests/script/prerequisitesInstallRunner.test.js
+++ b/tests/script/prerequisitesInstallRunner.test.js
@@ -40,7 +40,7 @@ describe("Check Pre-requisites installation on Windows", function () {
     });
 
     afterEach(async function () {
-        this.timeout(10000);
+        this.timeout(20000);
         if (this.currentTest.state === "failed") {
             logger.info(
                 `Terminal output on failure: >>\r ${testRunner.output}`
@@ -49,7 +49,7 @@ describe("Check Pre-requisites installation on Windows", function () {
         try {
             await testRunner.stop(6000);
         } catch {
-            logger.debug("Error to clean up terminal after test");
+            logger.info("Error to clean up terminal after test");
         }
         testRunner = null;
     });