github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: make contentTracing.stopRecording() failure clearer (#38520)

Browse Source 
chore: make contentTracing.stopRecording() failure clearer

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot]
2023-05-31 11:28:22 -04:00
committed by GitHub
parent 2281fbbe6c
commit 017fd30e89
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
shell/browser/api/electron_api_content_tracing.cc
View File

@@ -77,15 +77,20 @@ void StopTracing(gin_helper::Promise<base::FilePath> promise,
}
},
std::move(promise), *file_path);
if (file_path) {
auto* instance = TracingController::GetInstance();
if (!instance->IsTracing()) {
std::move(resolve_or_reject)
.Run(absl::make_optional(
"Failed to stop tracing - no trace in progress"));
} else if (file_path) {
auto split_callback = base::SplitOnceCallback(std::move(resolve_or_reject));
auto endpoint = TracingController::CreateFileEndpoint(
*file_path,
base::BindOnce(std::move(split_callback.first), absl::nullopt));
if (!TracingController::GetInstance()->StopTracing(endpoint)) {
if (!instance->StopTracing(endpoint)) {
std::move(split_callback.second)
.Run(absl::make_optional(
"Failed to stop tracing (was a trace in progress?)"));
.Run(absl::make_optional("Failed to stop tracing"));
}
} else {
std::move(resolve_or_reject)

2
spec/api-content-tracing-spec.ts
View File

@@ -113,7 +113,7 @@ ifdescribe(!(['arm', 'arm64', 'ia32'].includes(process.arch)))('contentTracing',
});
it('rejects if no trace is happening', async () => {
await expect(contentTracing.stopRecording()).to.be.rejected();
await expect(contentTracing.stopRecording()).to.be.rejectedWith('Failed to stop tracing - no trace in progress');
});
});