3
3
import os
4
4
import platform
5
5
import socket
6
- import time
7
- import traceback
8
6
from abc import ABCMeta , abstractmethod
9
7
from typing import cast , Any , List , Mapping , Optional , Tuple , Type
10
8
11
9
import mozprocess
12
10
from mozdebug import DebuggerInfo
13
11
from mozlog .structuredlog import StructuredLogger
14
12
15
- from ..environment import wait_for_service
16
13
from ..testloader import GroupMetadata
17
14
from ..wptcommandline import require_arg # noqa: F401
18
15
from ..wpttest import Test
@@ -319,7 +316,6 @@ def __init__(self,
319
316
self .env = os .environ .copy () if env is None else env
320
317
self .webdriver_args = webdriver_args if webdriver_args is not None else []
321
318
322
- self .init_deadline : Optional [float ] = None
323
319
self ._output_handler : Optional [OutputHandler ] = None
324
320
self ._cmd = None
325
321
self ._proc : Optional [mozprocess .ProcessHandler ] = None
@@ -330,7 +326,6 @@ def make_command(self) -> List[str]:
330
326
return [self .webdriver_binary ] + self .webdriver_args
331
327
332
328
def start (self , group_metadata : GroupMetadata , ** kwargs : Any ) -> None :
333
- self .init_deadline = time .time () + self .init_timeout
334
329
try :
335
330
self ._run_server (group_metadata , ** kwargs )
336
331
except KeyboardInterrupt :
@@ -345,7 +340,6 @@ def create_output_handler(self, cmd: List[str]) -> OutputHandler:
345
340
return OutputHandler (self .logger , cmd )
346
341
347
342
def _run_server (self , group_metadata : GroupMetadata , ** kwargs : Any ) -> None :
348
- assert self .init_deadline is not None
349
343
cmd = self .make_command ()
350
344
self ._output_handler = self .create_output_handler (cmd )
351
345
@@ -365,21 +359,7 @@ def _run_server(self, group_metadata: GroupMetadata, **kwargs: Any) -> None:
365
359
raise
366
360
self ._output_handler .after_process_start (self ._proc .pid )
367
361
368
- try :
369
- wait_for_service (
370
- self .logger ,
371
- self .host ,
372
- self .port ,
373
- timeout = self .init_deadline - time .time (),
374
- server_process = self ._proc ,
375
- )
376
- except Exception :
377
- self .logger .error (
378
- "WebDriver was not accessible "
379
- f"within the timeout:\n { traceback .format_exc ()} " )
380
- raise
381
- finally :
382
- self ._output_handler .start (group_metadata = group_metadata , ** kwargs )
362
+ self ._output_handler .start (group_metadata = group_metadata , ** kwargs )
383
363
self .logger .debug ("_run complete" )
384
364
385
365
def stop (self , force : bool = False ) -> bool :
0 commit comments