Skip to content

Commit 688d62f

Browse files
committed
Bug 1868591 - Fix PollPromise timeout warning. r=webdriver-reviewers,jdescottes
Differential Revision: https://phabricator.services.mozilla.com/D195783 UltraBlame original commit: f5094efab3559951c54ae24fef163c54cbdc72f5
1 parent 2106209 commit 688d62f

File tree

2 files changed

+269
-6
lines changed

2 files changed

+269
-6
lines changed

remote/shared/Sync.sys.mjs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,6 +1773,11 @@ Ci
17731773
nsITimer
17741774
)
17751775
;
1776+
let
1777+
didTimeOut
1778+
=
1779+
false
1780+
;
17761781
if
17771782
(
17781783
typeof
@@ -2012,6 +2017,10 @@ end
20122017
)
20132018
)
20142019
{
2020+
didTimeOut
2021+
=
2022+
true
2023+
;
20152024
resolve
20162025
(
20172026
rejected
@@ -2069,12 +2078,7 @@ res
20692078
{
20702079
if
20712080
(
2072-
Number
2073-
.
2074-
isInteger
2075-
(
2076-
timeout
2077-
)
2081+
didTimeOut
20782082
)
20792083
{
20802084
lazy

remote/shared/test/xpcshell/test_Sync.js

Lines changed: 259 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,32 @@ mjs
5555
"
5656
)
5757
;
58+
const
59+
{
60+
Log
61+
}
62+
=
63+
ChromeUtils
64+
.
65+
importESModule
66+
(
67+
"
68+
resource
69+
:
70+
/
71+
/
72+
gre
73+
/
74+
modules
75+
/
76+
Log
77+
.
78+
sys
79+
.
80+
mjs
81+
"
82+
)
83+
;
5884
class
5985
MockElement
6086
{
@@ -282,6 +308,60 @@ false
282308
;
283309
}
284310
}
311+
class
312+
MockAppender
313+
extends
314+
Log
315+
.
316+
Appender
317+
{
318+
constructor
319+
(
320+
formatter
321+
)
322+
{
323+
super
324+
(
325+
formatter
326+
)
327+
;
328+
this
329+
.
330+
messages
331+
=
332+
[
333+
]
334+
;
335+
}
336+
append
337+
(
338+
message
339+
)
340+
{
341+
this
342+
.
343+
doAppend
344+
(
345+
message
346+
)
347+
;
348+
}
349+
doAppend
350+
(
351+
message
352+
)
353+
{
354+
this
355+
.
356+
messages
357+
.
358+
push
359+
(
360+
message
361+
)
362+
;
363+
}
364+
}
285365
add_task
286366
(
287367
async
@@ -2176,3 +2256,182 @@ nevals
21762256
}
21772257
)
21782258
;
2259+
add_task
2260+
(
2261+
async
2262+
function
2263+
test_PollPromise_resolve
2264+
(
2265+
)
2266+
{
2267+
const
2268+
log
2269+
=
2270+
Log
2271+
.
2272+
repository
2273+
.
2274+
getLogger
2275+
(
2276+
"
2277+
RemoteAgent
2278+
"
2279+
)
2280+
;
2281+
const
2282+
appender
2283+
=
2284+
new
2285+
MockAppender
2286+
(
2287+
new
2288+
Log
2289+
.
2290+
BasicFormatter
2291+
(
2292+
)
2293+
)
2294+
;
2295+
appender
2296+
.
2297+
level
2298+
=
2299+
Log
2300+
.
2301+
Level
2302+
.
2303+
Info
2304+
;
2305+
log
2306+
.
2307+
addAppender
2308+
(
2309+
appender
2310+
)
2311+
;
2312+
const
2313+
errorMessage
2314+
=
2315+
"
2316+
PollingFailed
2317+
"
2318+
;
2319+
const
2320+
timeout
2321+
=
2322+
100
2323+
;
2324+
await
2325+
new
2326+
PollPromise
2327+
(
2328+
(
2329+
resolve
2330+
reject
2331+
)
2332+
=
2333+
>
2334+
{
2335+
resolve
2336+
(
2337+
)
2338+
;
2339+
}
2340+
{
2341+
timeout
2342+
errorMessage
2343+
}
2344+
)
2345+
;
2346+
Assert
2347+
.
2348+
equal
2349+
(
2350+
appender
2351+
.
2352+
messages
2353+
.
2354+
length
2355+
0
2356+
)
2357+
;
2358+
await
2359+
new
2360+
PollPromise
2361+
(
2362+
(
2363+
resolve
2364+
reject
2365+
)
2366+
=
2367+
>
2368+
{
2369+
reject
2370+
(
2371+
)
2372+
;
2373+
}
2374+
{
2375+
timeout
2376+
errorMessage
2377+
:
2378+
"
2379+
PollingFailed
2380+
"
2381+
}
2382+
)
2383+
;
2384+
Assert
2385+
.
2386+
equal
2387+
(
2388+
appender
2389+
.
2390+
messages
2391+
.
2392+
length
2393+
1
2394+
)
2395+
;
2396+
Assert
2397+
.
2398+
equal
2399+
(
2400+
appender
2401+
.
2402+
messages
2403+
[
2404+
0
2405+
]
2406+
.
2407+
level
2408+
Log
2409+
.
2410+
Level
2411+
.
2412+
Warn
2413+
)
2414+
;
2415+
Assert
2416+
.
2417+
equal
2418+
(
2419+
appender
2420+
.
2421+
messages
2422+
[
2423+
0
2424+
]
2425+
.
2426+
message
2427+
"
2428+
PollingFailed
2429+
after
2430+
100
2431+
ms
2432+
"
2433+
)
2434+
;
2435+
}
2436+
)
2437+
;

0 commit comments

Comments
 (0)