Skip to content

Commit d2711ee

Browse files
committed
allow one timeout between tries to avoid resource locking
1 parent 2c17004 commit d2711ee

File tree

7 files changed

+20
-16
lines changed

7 files changed

+20
-16
lines changed

packages/selenium-ide/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/selenium-ide",
3-
"version": "4.0.0-alpha.21",
3+
"version": "4.0.0-alpha.22",
44
"private": true,
55
"description": "Selenium IDE electron app",
66
"author": "Todd <[email protected]>",
@@ -100,10 +100,10 @@
100100
"@mui/lab": "^5.0.0-alpha.72",
101101
"@mui/material": "^5.5.0",
102102
"@seleniumhq/get-driver": "^4.0.0-alpha.1",
103-
"@seleniumhq/side-api": "^4.0.0-alpha.8",
103+
"@seleniumhq/side-api": "^4.0.0-alpha.9",
104104
"@seleniumhq/side-model": "^4.0.0-alpha.2",
105105
"@seleniumhq/side-plugin-example": "^4.0.0-alpha.1",
106-
"@seleniumhq/side-runtime": "^4.0.0-alpha.13",
106+
"@seleniumhq/side-runtime": "^4.0.0-alpha.14",
107107
"dnd-core": "16.0.1",
108108
"electron-chromedriver": "^18.0.0",
109109
"electron-log": "^4.4.8",

packages/side-api/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/side-api",
3-
"version": "4.0.0-alpha.8",
3+
"version": "4.0.0-alpha.9",
44
"description": "Selenium IDE shared models",
55
"author": "Todd Tarsi <[email protected]>",
66
"homepage": "http://github.com/SeleniumHQ/selenium-ide",
@@ -19,7 +19,7 @@
1919
"@seleniumhq/browser-info": "^4.0.0-alpha.1",
2020
"@seleniumhq/get-driver": "^4.0.0-alpha.2",
2121
"@seleniumhq/side-model": "^4.0.0-alpha.2",
22-
"@seleniumhq/side-runtime": "^4.0.0-alpha.13",
22+
"@seleniumhq/side-runtime": "^4.0.0-alpha.14",
2323
"@types/electron": "1.6.10",
2424
"lodash": "^4.17.21"
2525
},

packages/side-plugin-example/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@seleniumhq/side-plugin-example",
33
"private": true,
4-
"version": "4.0.0-alpha.5",
4+
"version": "4.0.0-alpha.6",
55
"description": "Selenium IDE example plugin",
66
"author": "Todd <[email protected]>",
77
"homepage": "http://github.com/SeleniumHQ/selenium-ide",
@@ -16,7 +16,7 @@
1616
"watch": "tsc --watch"
1717
},
1818
"devDependencies": {
19-
"@seleniumhq/side-runtime": "^4.0.0-alpha.13"
19+
"@seleniumhq/side-runtime": "^4.0.0-alpha.14"
2020
},
2121
"repository": {
2222
"type": "git",

packages/side-runner/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "selenium-side-runner",
3-
"version": "4.0.0-alpha.31",
3+
"version": "4.0.0-alpha.32",
44
"description": "Run Selenium IDE projects in cli",
55
"repository": "https://github.com/SeleniumHQ/selenium-ide",
66
"scripts": {
@@ -23,7 +23,7 @@
2323
"license": "Apache-2.0",
2424
"dependencies": {
2525
"@seleniumhq/side-model": "^4.0.0-alpha.2",
26-
"@seleniumhq/side-runtime": "^4.0.0-alpha.13",
26+
"@seleniumhq/side-runtime": "^4.0.0-alpha.14",
2727
"commander": "^9.4.0",
2828
"glob": "^7.2.0",
2929
"jest": "^27.5.1",

packages/side-runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/side-runtime",
3-
"version": "4.0.0-alpha.13",
3+
"version": "4.0.0-alpha.14",
44
"description": "Selenium IDE playback and execution",
55
"author": "Tomer <[email protected]>",
66
"homepage": "http://github.com/SeleniumHQ/selenium-ide",

packages/side-runtime/src/playback-tree/command-node.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ export class CommandNode {
128128
}
129129
}
130130

131+
async pauseTimeout(timeout?: number): Promise<void> {
132+
return new Promise((resolve) => setTimeout(resolve, timeout))
133+
}
134+
131135
async retryCommand(
132136
execute: () => Promise<unknown>,
133137
timeout: number
@@ -143,6 +147,7 @@ export class CommandNode {
143147
} catch (e) {
144148
this.handleTransientError(e, timeout)
145149
clearTimeout(expirationTimer)
150+
await this.pauseTimeout()
146151
return this.retryCommand(execute, timeout)
147152
}
148153
}

packages/side-runtime/src/webdriver.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,16 +1308,15 @@ export default class WebDriverExecutor {
13081308
}, timeout)
13091309
const clearTimer = () => timer && clearTimeout(timer)
13101310

1311-
condition.then(
1312-
function (value: T) {
1311+
condition
1312+
.then((value: T) => {
13131313
clearTimer()
13141314
resolve(value)
1315-
},
1316-
function (error: Error) {
1315+
})
1316+
.catch((error: Error) => {
13171317
clearTimer()
13181318
reject(error)
1319-
}
1320-
)
1319+
})
13211320
})
13221321
}
13231322

0 commit comments

Comments
 (0)