diff --git a/packages/flutter_goldens/test/flutter_goldens_test.dart b/packages/flutter_goldens/test/flutter_goldens_test.dart index 75e4b77f06..4363c0416d 100644 --- a/packages/flutter_goldens/test/flutter_goldens_test.dart +++ b/packages/flutter_goldens/test/flutter_goldens_test.dart @@ -257,46 +257,44 @@ void main() { await skiaClient.tryjobInit(); }); - // TODO(Piinks): Re-enable once https://github.com/flutter/flutter/issues/100304 - // is resolved. - // test('throws for error state from imgtestAdd', () { - // final File goldenFile = fs.file('/workDirectory/temp/golden_file_test.png') - // ..createSync(recursive: true); - // platform = FakePlatform( - // environment: { - // 'FLUTTER_ROOT': _kFlutterRoot, - // 'GOLDCTL' : 'goldctl', - // }, - // operatingSystem: 'macos' - // ); - // - // skiaClient = SkiaGoldClient( - // workDirectory, - // fs: fs, - // process: process, - // platform: platform, - // httpClient: fakeHttpClient, - // ); - // - // const RunInvocation goldctlInvocation = RunInvocation( - // [ - // 'goldctl', - // 'imgtest', 'add', - // '--work-dir', '/workDirectory/temp', - // '--test-name', 'golden_file_test', - // '--png-file', '/workDirectory/temp/golden_file_test.png', - // '--passfail', - // ], - // null, - // ); - // process.processResults[goldctlInvocation] = ProcessResult(123, 1, 'Expected failure', 'Expected failure'); - // process.fallbackProcessResult = ProcessResult(123, 1, 'Fallback failure', 'Fallback failure'); - // - // expect( - // skiaClient.imgtestAdd('golden_file_test', goldenFile), - // throwsException, - // ); - // }); + test('throws for error state from imgtestAdd', () { + final File goldenFile = fs.file('/workDirectory/temp/golden_file_test.png') + ..createSync(recursive: true); + platform = FakePlatform( + environment: { + 'FLUTTER_ROOT': _kFlutterRoot, + 'GOLDCTL' : 'goldctl', + }, + operatingSystem: 'macos' + ); + + skiaClient = SkiaGoldClient( + workDirectory, + fs: fs, + process: process, + platform: platform, + httpClient: fakeHttpClient, + ); + + const RunInvocation goldctlInvocation = RunInvocation( + [ + 'goldctl', + 'imgtest', 'add', + '--work-dir', '/workDirectory/temp', + '--test-name', 'golden_file_test', + '--png-file', '/workDirectory/temp/golden_file_test.png', + '--passfail', + ], + null, + ); + process.processResults[goldctlInvocation] = ProcessResult(123, 1, 'Expected failure', 'Expected failure'); + process.fallbackProcessResult = ProcessResult(123, 1, 'Fallback failure', 'Fallback failure'); + + expect( + skiaClient.imgtestAdd('golden_file_test', goldenFile), + throwsException, + ); + }); test('correctly inits tryjob for luci', () async { platform = FakePlatform( diff --git a/packages/flutter_goldens_client/lib/skia_client.dart b/packages/flutter_goldens_client/lib/skia_client.dart index 42a02b4399..d79f220a15 100644 --- a/packages/flutter_goldens_client/lib/skia_client.dart +++ b/packages/flutter_goldens_client/lib/skia_client.dart @@ -212,12 +212,7 @@ class SkiaGoldClient { ..writeln('Debug information for Gold:') ..writeln('stdout: ${result.stdout}') ..writeln('stderr: ${result.stderr}'); - // Temporarily print logs for issue diagnosis - // ignore: avoid_print - print(buf.toString()); - // TODO(Piinks): Re-enable once https://github.com/flutter/flutter/issues/100304 - // is resolved. - // throw Exception(buf.toString()); + throw Exception(buf.toString()); } return true;