Skip to content

Commit c0a3702

Browse files
committed
Python fix on runner, timout and missing file skip
1 parent a213511 commit c0a3702

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

.github/workflows/test_offline.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,27 @@ jobs:
107107
run: |
108108
sudo apt-get update
109109
sudo apt-get install -y git wget flex bison gperf ccache libffi-dev libssl-dev dfu-util libusb-1.0-0-dev libgcrypt20 libglib2.0-0 libpixman-1-0 libsdl2-2.0-0 libslirp0
110-
python3 --version
111110
cd tests
112111
npm ci
113112
114113
- name: Install dependencies and node.js (MacOS)
115114
if: matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
116115
run: |
117-
brew install dfu-util libgcrypt glib pixman sdl2 libslirp python3
118-
python3 --version
116+
brew install dfu-util libgcrypt glib pixman sdl2 libslirp
119117
cd tests
120118
npm ci
121119
122120
- name: Run IDF offline installation (non-Windows)
123121
if: matrix.os != 'windows-latest'
124122
run: |
125123
python3 --version
124+
SETUP_PYTHON=$(which python3)
125+
echo "Setup python is at: $SETUP_PYTHON"
126+
mkdir -p $HOME/.local/bin
127+
ln -sf $SETUP_PYTHON $HOME/.local/bin/python3
128+
export PATH="$HOME/.local/bin:$PATH"
129+
python3 --version
130+
which python3
126131
export LOG_TO_FILE="true"
127132
export EIM_CLI_PATH="../artifacts/eim"
128133
export BUILD_INFO_PATH="../artifacts"

tests/classes/CLITestRunner.class.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CLITestRunner {
1919
: ["-ExecutionPolicy", "Bypass", "-NoProfile"];
2020
}
2121

22-
async runIDFTerminal(loadScript, timeout = 3000) {
22+
async runIDFTerminal(loadScript, timeout = 5000) {
2323
try {
2424
await this.start();
2525
const loadCommand =

tests/scripts/CLICustomInstall.test.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,13 @@ export function runCLICustomInstallTest({
3131
idfVersion: offlineIDFVersion,
3232
packageName: offlinePkgName,
3333
});
34-
35-
args.push(`--use-local-archive "${pathToOfflineArchive}"`);
34+
if (pathToOfflineArchive) {
35+
args.push(`--use-local-archive "${pathToOfflineArchive}"`);
36+
}
37+
}
38+
if (offlineIDFVersion && !pathToOfflineArchive) {
39+
logger.info(">>>>>>> Offline archive not found, skipping this test");
40+
this.skip();
3641
}
3742
if (testProxyMode) {
3843
try {

tests/scripts/GUICustomInstall.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ export function runGUICustomInstallTest({
393393
it("08- Should show list of optional features", async function () {
394394
this.timeout(10000);
395395
await eimRunner.clickButton("Continue with Selected Mirrors");
396-
await new Promise((resolve) => setTimeout(resolve, 2000));
396+
await new Promise((resolve) => setTimeout(resolve, 4000));
397397

398398
for (let version of idfVersionList) {
399399
if (idfVersionList.length > 1) {

0 commit comments

Comments
 (0)