Skip to content
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.

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

serial: Fix getSignals() error handling #26824

Merged
merged 1 commit into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions resources/chromium/fake-serial.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,13 @@ class FakeSerialPort {
ringIndicator: false,
dataSetReady: false
};
this.inputSignalFailure_ = false;
this.outputSignals_ = {
dataTerminalReady: false,
requestToSend: false,
break: false
};
this.outputSignalFailure_ = false;
}

open(options, client) {
Expand Down Expand Up @@ -170,10 +172,18 @@ class FakeSerialPort {
this.inputSignals_ = signals;
}

simulateInputSignalFailure(fail) {
this.inputSignalFailure_ = fail;
}

get outputSignals() {
return this.outputSignals_;
}

simulateOutputSignalFailure(fail) {
this.outputSignalFailure_ = fail;
}

writable() {
if (this.writable_)
return Promise.resolve();
Expand Down Expand Up @@ -241,6 +251,10 @@ class FakeSerialPort {
}

async getControlSignals() {
if (this.inputSignalFailure_) {
return {signals: null};
}

const signals = {
dcd: this.inputSignals_.dataCarrierDetect,
cts: this.inputSignals_.clearToSend,
Expand All @@ -251,6 +265,10 @@ class FakeSerialPort {
}

async setControlSignals(signals) {
if (this.outputSignalFailure_) {
return {success: false};
}

if (signals.hasDtr) {
this.outputSignals_.dataTerminalReady = signals.dtr;
}
Expand Down
20 changes: 20 additions & 0 deletions serial/serialPort_getSignals.https.any.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,23 @@ serial_test(async (t, fake) => {
signals = await port.getSignals();
assert_object_equals(signals, expectedSignals, 'DSR set');
}, 'getSignals() returns the current state of input control signals');

serial_test(async (t, fake) => {
const {port, fakePort} = await getFakeSerialPort(fake);
await port.open({baudRate: 9600});

fakePort.simulateInputSignalFailure(true);
await promise_rejects_dom(t, 'NetworkError', port.getSignals());

fakePort.simulateInputSignalFailure(false);
const expectedSignals = {
dataCarrierDetect: false,
clearToSend: false,
ringIndicator: false,
dataSetReady: false
};
const signals = await port.getSignals();
assert_object_equals(signals, expectedSignals);

await port.close();
}, 'getSignals() rejects on failure');
14 changes: 14 additions & 0 deletions serial/serialPort_setSignals.https.any.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,17 @@ serial_test(async (t, fake) => {
expectedSignals.break = false;
assert_object_equals(fakePort.outputSignals, expectedSignals, 'invert');
}, 'setSignals() modifies the state of the port');

serial_test(async (t, fake) => {
const {port, fakePort} = await getFakeSerialPort(fake);
await port.open({baudRate: 9600});

fakePort.simulateOutputSignalFailure(true);
await promise_rejects_dom(t, 'NetworkError', port.setSignals({break: true}));

fakePort.simulateOutputSignalFailure(false);
await port.setSignals({break: true});
assert_true(fakePort.outputSignals.break);

await port.close();
}, 'setSignals() rejects on failure');