Skip to content

Commit e194766

Browse files
bug fix for safe connect server (#127)
* bug fix for safe connect server, when _adb._safe_connect:66 raising AdbTimeout, it will be failure. * add error assertion --------- Co-authored-by: ZERTIAN <zerui.tian@mercedes-benz.com>
1 parent 9facf46 commit e194766

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

adbutils/_adb.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,13 @@ def _create_socket(self):
6464
def _safe_connect(self):
6565
try:
6666
return self._create_socket()
67+
except AdbTimeout:
68+
pass
6769
except AdbConnectionError:
68-
flags = subprocess.CREATE_NO_WINDOW if os.name == 'nt' else 0
69-
subprocess.run([adb_path(), "start-server"], timeout=20.0, creationflags=flags) # 20s should enough for adb start
70-
return self._create_socket()
70+
pass
71+
flags = subprocess.CREATE_NO_WINDOW if os.name == 'nt' else 0
72+
subprocess.run([adb_path(), "start-server"], timeout=20.0, creationflags=flags) # 20s should enough for adb start
73+
return self._create_socket()
7174

7275
@property
7376
def closed(self) -> bool:

0 commit comments

Comments
 (0)