firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix install checks in flavors devicelab tests" (#133894)

Browse Source 
Reverts flutter/flutter#133719

`Windows_android flavors_test_win` failed twice in a row in the tree
This commit is contained in:
Victoria Ashworth 2023-09-01 17:17:48 -05:00 committed by GitHub
parent b1f691c9fc
commit 5649161bd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 65 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev/devicelab/bin/tasks/flavors_test.dart
View File

@ -13,10 +13,8 @@ Future<void> main() async {
await task(() async { await task(() async {
await createFlavorsTest().call(); await createFlavorsTest().call();
await createIntegrationTestFlavorsTest().call(); await createIntegrationTestFlavorsTest().call();
// test install and uninstall of flavors app
final TaskResult installTestsResult = await inDirectory( await inDirectory('${flutterDirectory.path}/dev/integration_tests/flavors', () async {
'${flutterDirectory.path}/dev/integration_tests/flavors',
() async {
await flutter( await flutter(
'install', 'install',
options: <String>['--debug', '--flavor', 'paid'], options: <String>['--debug', '--flavor', 'paid'],
@ -25,7 +23,6 @@ Future<void> main() async {
'install', 'install',
options: <String>['--debug', '--flavor', 'paid', '--uninstall-only'], options: <String>['--debug', '--flavor', 'paid', '--uninstall-only'],
); );
final StringBuffer stderr = StringBuffer(); final StringBuffer stderr = StringBuffer();
await evalFlutter( await evalFlutter(
'install', 'install',
@ -35,15 +32,12 @@ Future<void> main() async {
); );
final String stderrString = stderr.toString(); final String stderrString = stderr.toString();
if (!stderrString.contains('"build/app/outputs/flutter-apk/app-bogus-release.apk" does not exist.')) { if (!stderrString.contains('The Xcode project defines schemes: free, paid')) {
print(stderrString); print(stderrString);
return TaskResult.failure('Should not succeed with bogus flavor'); return TaskResult.failure('Should not succeed with bogus flavor');
} }
});
return TaskResult.success(null); return TaskResult.success(null);
},
);
return installTestsResult;
}); });
} }

11
dev/devicelab/bin/tasks/flavors_test_ios.dart
View File

@ -14,9 +14,7 @@ Future<void> main() async {
await createFlavorsTest().call(); await createFlavorsTest().call();
await createIntegrationTestFlavorsTest().call(); await createIntegrationTestFlavorsTest().call();
// test install and uninstall of flavors app // test install and uninstall of flavors app
final TaskResult installTestsResult = await inDirectory( await inDirectory('${flutterDirectory.path}/dev/integration_tests/flavors', () async {
'${flutterDirectory.path}/dev/integration_tests/flavors',
() async {
await flutter( await flutter(
'install', 'install',
options: <String>['--flavor', 'paid'], options: <String>['--flavor', 'paid'],
@ -34,15 +32,12 @@ Future<void> main() async {
); );
final String stderrString = stderr.toString(); final String stderrString = stderr.toString();
if (!stderrString.contains('The Xcode project defines schemes: free, paid')) { if (!stderrString.contains('install failed, bogus flavor not found')) {
print(stderrString); print(stderrString);
return TaskResult.failure('Should not succeed with bogus flavor'); return TaskResult.failure('Should not succeed with bogus flavor');
} }
});
return TaskResult.success(null); return TaskResult.success(null);
},
);
return installTestsResult;
}); });
} }

9
dev/devicelab/bin/tasks/flavors_test_macos.dart
View File

@ -14,9 +14,7 @@ Future<void> main() async {
await createFlavorsTest().call(); await createFlavorsTest().call();
await createIntegrationTestFlavorsTest().call(); await createIntegrationTestFlavorsTest().call();
final TaskResult installTestsResult = await inDirectory( await inDirectory('${flutterDirectory.path}/dev/integration_tests/flavors', () async {
'${flutterDirectory.path}/dev/integration_tests/flavors',
() async {
final StringBuffer stderr = StringBuffer(); final StringBuffer stderr = StringBuffer();
await evalFlutter( await evalFlutter(
@ -34,11 +32,8 @@ Future<void> main() async {
print(stderrString); print(stderrString);
return TaskResult.failure('Installing a macOS app on macOS should no-op'); return TaskResult.failure('Installing a macOS app on macOS should no-op');
} }
});
return TaskResult.success(null); return TaskResult.success(null);
},
);
return installTestsResult;
}); });
} }