From 15ce4dfd4476fc08075f3e0b836efad8cfc1a3a2 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 21 Feb 2024 10:48:17 -0800 Subject: [PATCH 1/2] Add a throw statement for imgtestAdd non 0 exit codes. --- testing/skia_gold_client/lib/skia_gold_client.dart | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/testing/skia_gold_client/lib/skia_gold_client.dart b/testing/skia_gold_client/lib/skia_gold_client.dart index c4b25631179e2..38545eacbc589 100644 --- a/testing/skia_gold_client/lib/skia_gold_client.dart +++ b/testing/skia_gold_client/lib/skia_gold_client.dart @@ -257,11 +257,15 @@ class SkiaGoldClient { final ProcessResult result = await _runCommand(imgtestCommand); if (result.exitCode != 0) { - // We do not want to throw for non-zero exit codes here, as an intentional - // change or new golden file test expect non-zero exit codes. Logging here - // is meant to inform when an unexpected result occurs. - print('goldctl imgtest add stdout: ${result.stdout}'); - print('goldctl imgtest add stderr: ${result.stderr}'); + final StringBuffer buf = StringBuffer() + ..writeln('Skia Gold imgtest add failed.') + ..writeln('An error occurred when adding a golden file test with ') + ..writeln('goldctl.') + ..writeln() + ..writeln('Debug information for Gold:') + ..writeln('stdout: ${result.stdout}') + ..writeln('stderr: ${result.stderr}'); + throw Exception(buf.toString()); } else if (verbose) { print('stdout:\n${result.stdout}'); print('stderr:\n${result.stderr}'); From 1a2c59723725559cd73fe654aebfe0fec4e73784 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 21 Feb 2024 11:16:27 -0800 Subject: [PATCH 2/2] ++ --- .../skia_gold_client/lib/skia_gold_client.dart | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/testing/skia_gold_client/lib/skia_gold_client.dart b/testing/skia_gold_client/lib/skia_gold_client.dart index 38545eacbc589..5f654a4bc37c8 100644 --- a/testing/skia_gold_client/lib/skia_gold_client.dart +++ b/testing/skia_gold_client/lib/skia_gold_client.dart @@ -257,12 +257,17 @@ class SkiaGoldClient { final ProcessResult result = await _runCommand(imgtestCommand); if (result.exitCode != 0) { - final StringBuffer buf = StringBuffer() - ..writeln('Skia Gold imgtest add failed.') - ..writeln('An error occurred when adding a golden file test with ') - ..writeln('goldctl.') +final StringBuffer buf = StringBuffer() + ..writeln('Skia Gold received an unapproved image in post-submit ') + ..writeln('testing. Golden file images in flutter/engine are triaged ') + ..writeln('in pre-submit during code review for the given PR.') ..writeln() - ..writeln('Debug information for Gold:') + ..writeln('Visit https://flutter-engine-gold.skia.org/ to view and approve ') + ..writeln('the image(s), or revert the associated change. For more ') + ..writeln('information, visit the wiki: ') + ..writeln('https://github.com/flutter/flutter/wiki/Writing-a-golden-file-test-for-package:flutter') + ..writeln() + ..writeln('Debug information for Gold --------------------------------') ..writeln('stdout: ${result.stdout}') ..writeln('stderr: ${result.stderr}'); throw Exception(buf.toString());