Skip to content

Commit ec94cdc

Browse files
yezhizhenservo-wpt-sync
authored andcommitted
Retry shutdown
Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
1 parent 3f19b5f commit ec94cdc

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

tools/wptrunner/wptrunner/browsers/servodriver.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,15 @@ def is_alive(self):
144144
return True
145145

146146
def stop(self, force=False):
147-
if self.is_alive():
148-
self.logger.info("Shutting down gracefully by extension command")
149-
conn = HTTPConnection(self.host, self.port)
147+
conn = HTTPConnection(self.host, self.port)
148+
while self.is_alive():
149+
self.logger.info("Trying to shut down gracefully by extension command")
150+
150151
conn.request("DELETE", "/session/dummy-session-id/servo/shutdown")
151152
res = conn.getresponse()
152153
self.logger.info(f"Got response status for shutdown command: {res.status}")
153-
# 0.05 is a heuristic value manually tested, after which servo always shutted down.
154-
time.sleep(0.05)
155-
while self.is_alive():
156-
self.logger.info("Still alive. Retry in 0.05 second")
157-
time.sleep(0.05)
154+
155+
time.sleep(0.1)
158156

159157
def find_wpt_prefs(self, logger):
160158
default_path = os.path.join("resources", "wpt-prefs.json")

0 commit comments

Comments
 (0)