Skip to content

fix: reset errors when fallback to list avds from directory #4079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2018
Merged

fix: reset errors when fallback to list avds from directory #4079

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75276a9
fix: reset errors when fallback to list avds from directory
Fatme Oct 29, 2018
8af307c
fix: fix unit tests
Fatme Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/common/mobile/android/android-virtual-device-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ export class AndroidVirtualDeviceService implements Mobile.IAndroidVirtualDevice
private async getEmulatorImagesCore(): Promise<Mobile.IEmulatorImagesOutput> {
let result: ISpawnResult = null;
let devices: Mobile.IDeviceInfo[] = [];
let errors: string[] = [];

if (this.pathToAvdManagerExecutable && this.$fs.exists(this.pathToAvdManagerExecutable)) {
result = await this.$childProcess.trySpawnFromCloseEvent(this.pathToAvdManagerExecutable, ["list", "avds"]);
Expand All @@ -160,11 +161,12 @@ export class AndroidVirtualDeviceService implements Mobile.IAndroidVirtualDevice

if (result && result.stdout) {
devices = this.parseListAvdsOutput(result.stdout);
errors = result && result.stderr ? [result.stderr] : [];
} else {
devices = this.listAvdsFromDirectory();
}

return { devices, errors: result && result.stderr ? [result.stderr] : [] };
return { devices, errors };
}

private async getRunningEmulatorData(runningEmulatorId: string, availableEmulators: Mobile.IDeviceInfo[]): Promise<Mobile.IDeviceInfo> {
Expand Down
18 changes: 18 additions & 0 deletions lib/common/test/unit-tests/mobile/android-virtual-device-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,24 @@ describe("androidVirtualDeviceService", () => {
assert.deepEqual(result[1], getAvailableEmulatorData({ displayName: "Nexus_5X_API_28", imageIdentifier: "Nexus_5X_API_28", version: "9.0.0", model: "Nexus 5X" }));
assert.deepEqual(result[2], getAvailableEmulatorData({ displayName: "Nexus_6P_API_28", imageIdentifier: "Nexus_6P_API_28", version: "9.0.0", model: "Nexus 6P" }));
});
// In this case we should fallback to list avd directory and should't report errors from avdmanager
it("should return devices and no errors when there is an error on avdmanager's stderr", async () => {
const iniFilesData = getIniFilesData();
const testInjector = createTestInjector({
avdManagerOutput: "",
avdManagerError: "my test error",
iniFilesData
});

const fs = testInjector.resolve("fs");
fs.readDirectory = () => _.keys(iniFilesData);

const avdService = testInjector.resolve("androidVirtualDeviceService");
const result = await avdService.getEmulatorImages(["emulator-5554 device"]);

assert.deepEqual(result.devices.length, 3);
assert.deepEqual(result.errors.length, 0);
});
});

describe("when avdmanager is not found", () => {
Expand Down