Commit 3d5d63a8 authored by Jason Simmons's avatar Jason Simmons Committed by GitHub

Accept any nonzero exit code as a signal of failure in the missing dependency test (#8738)

parent fecc4e65
...@@ -25,23 +25,23 @@ void main() { ...@@ -25,23 +25,23 @@ void main() {
testUsingContext('TestAsyncUtils guarded function test', () async { testUsingContext('TestAsyncUtils guarded function test', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
return _testFile('test_async_utils_guarded', 1, automatedTestsDirectory, flutterTestDirectory); return _testFile('test_async_utils_guarded', automatedTestsDirectory, flutterTestDirectory);
}); });
testUsingContext('TestAsyncUtils unguarded function test', () async { testUsingContext('TestAsyncUtils unguarded function test', () async {
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
return _testFile('test_async_utils_unguarded', 1, automatedTestsDirectory, flutterTestDirectory); return _testFile('test_async_utils_unguarded', automatedTestsDirectory, flutterTestDirectory);
}); });
testUsingContext('Missing flutter_test dependency', () async { testUsingContext('Missing flutter_test dependency', () async {
final String missingDependencyTests = fs.path.join('..', '..', 'dev', 'missing_dependency_tests'); final String missingDependencyTests = fs.path.join('..', '..', 'dev', 'missing_dependency_tests');
Cache.flutterRoot = '../..'; Cache.flutterRoot = '../..';
return _testFile('trivial', 1, missingDependencyTests, missingDependencyTests); return _testFile('trivial', missingDependencyTests, missingDependencyTests);
}); });
}, skip: io.Platform.isWindows); // TODO(goderbauer): enable when sky_shell is available }, skip: io.Platform.isWindows); // TODO(goderbauer): enable when sky_shell is available
} }
Future<Null> _testFile(String testName, int wantedExitCode, String workingDirectory, String testDirectory) async { Future<Null> _testFile(String testName, String workingDirectory, String testDirectory) async {
final String fullTestName = fs.path.join(testDirectory, '${testName}_test.dart'); final String fullTestName = fs.path.join(testDirectory, '${testName}_test.dart');
final File testFile = fs.file(fullTestName); final File testFile = fs.file(fullTestName);
expect(testFile.existsSync(), true); expect(testFile.existsSync(), true);
...@@ -71,7 +71,7 @@ Future<Null> _testFile(String testName, int wantedExitCode, String workingDirect ...@@ -71,7 +71,7 @@ Future<Null> _testFile(String testName, int wantedExitCode, String workingDirect
testExclusionCompleter.complete(); testExclusionCompleter.complete();
} }
expect(exec.exitCode, wantedExitCode); expect(exec.exitCode, isNonZero);
final List<String> output = exec.stdout.split('\n'); final List<String> output = exec.stdout.split('\n');
output.add('<<stderr>>'); output.add('<<stderr>>');
output.addAll(exec.stderr.split('\n')); output.addAll(exec.stderr.split('\n'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment