jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add one more fallback for the adb path

Browse Source 
Summary: It seems that adb path has changed on the jest-e2e side. That might case the flipper e2e test failure. With this fallback we have granular control of the path.

Reviewed By: antonk52

Differential Revision: D46278512

fbshipit-source-id: 97310459de54eeb003eefb3a3ff06af8b13bebae
This commit is contained in:
Andrey Goncharov
2023-05-30 09:47:19 -07:00
committed by Facebook GitHub Bot
parent ff6b0043c4
commit 53a5939d68
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
desktop/flipper-server-core/src/devices/android/adbClient.tsx
View File

@@ -51,12 +51,20 @@ async function startAdbServer(androidHome: string) {
const adbPath = path.resolve(androidHome, 'platform-tools', 'adb'); const adbPath = path.resolve(androidHome, 'platform-tools', 'adb');
const args = ['start-server']; const args = ['start-server'];
return execFile(adbPath, args).catch((error) => { return execFile(adbPath, args)
if (error.code == 'ENOENT') { .catch((error) => {
console.info('falling back to the alternative adb path'); if (error.code == 'ENOENT') {
return execFile(path.resolve(androidHome, 'adb'), args); console.info('falling back to the alternative adb path');
} return execFile(path.resolve(androidHome, 'adb'), args);
}
throw error;
})
.catch((error) => {
if (error.code == 'ENOENT') {
console.info('falling back to the adb path of last resort');
return execFile(androidHome, args);
}
throw error; throw error;
}); });
} }