Skip to content

F
Front-End
Unverified Commit 5649161b authored by Victoria Ashworth's avatar Victoria Ashworth Committed by GitHub
Browse files
Options

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

Reverts flutter/flutter#133719

`Windows_android flavors_test_win` failed twice in a row in the tree
parent b1f691c9
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 81 deletions
dev/devicelab/bin/tasks/flavors_test.dart
View file @ 5649161b
...@@ -13,37 +13,31 @@ Future<void> main() async { ...@@ -13,37 +13,31 @@ 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
await inDirectory('${flutterDirectory.path}/dev/integration_tests/flavors', () async {
await flutter(
'install',
options: <String>['--debug', '--flavor', 'paid'],
);
await flutter(
'install',
options: <String>['--debug', '--flavor', 'paid', '--uninstall-only'],
);
final StringBuffer stderr = StringBuffer();
await evalFlutter(
'install',
canFail: true,
stderr: stderr,
options: <String>['--flavor', 'bogus'],
);
final TaskResult installTestsResult = await inDirectory( final String stderrString = stderr.toString();
'${flutterDirectory.path}/dev/integration_tests/flavors', if (!stderrString.contains('The Xcode project defines schemes: free, paid')) {
() async { print(stderrString);
await flutter( return TaskResult.failure('Should not succeed with bogus flavor');
'install', }
options: <String>['--debug', '--flavor', 'paid'], });
);
await flutter(
'install',
options: <String>['--debug', '--flavor', 'paid', '--uninstall-only'],
);
final StringBuffer stderr = StringBuffer(); return TaskResult.success(null);
await evalFlutter(
'install',
canFail: true,
stderr: stderr,
options: <String>['--flavor', 'bogus'],
);
final String stderrString = stderr.toString();
if (!stderrString.contains('"build/app/outputs/flutter-apk/app-bogus-release.apk" does not exist.')) {
print(stderrString);
return TaskResult.failure('Should not succeed with bogus flavor');
}
return TaskResult.success(null);
},
);
return installTestsResult;
}); });
} }
dev/devicelab/bin/tasks/flavors_test_ios.dart
View file @ 5649161b
...@@ -14,35 +14,30 @@ Future<void> main() async { ...@@ -14,35 +14,30 @@ 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', await flutter(
() async { 'install',
await flutter( options: <String>['--flavor', 'paid'],
'install', );
options: <String>['--flavor', 'paid'], await flutter(
); 'install',
await flutter( options: <String>['--flavor', 'paid', '--uninstall-only'],
'install', );
options: <String>['--flavor', 'paid', '--uninstall-only'], final StringBuffer stderr = StringBuffer();
); await evalFlutter(
final StringBuffer stderr = StringBuffer(); 'install',
await evalFlutter( canFail: true,
'install', stderr: stderr,
canFail: true, options: <String>['--flavor', 'bogus'],
stderr: stderr, );
options: <String>['--flavor', 'bogus'],
);
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;
}); });
} }
dev/devicelab/bin/tasks/flavors_test_macos.dart
View file @ 5649161b
...@@ -14,31 +14,26 @@ Future<void> main() async { ...@@ -14,31 +14,26 @@ 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', final StringBuffer stderr = StringBuffer();
() async {
final StringBuffer stderr = StringBuffer();
await evalFlutter( await evalFlutter(
'install', 'install',
canFail: true, canFail: true,
stderr: stderr, stderr: stderr,
options: <String>[ options: <String>[
'--d', 'macos', '--d', 'macos',
'--flavor', 'free' '--flavor', 'free'
], ],
); );
final String stderrString = stderr.toString(); final String stderrString = stderr.toString();
if (!stderrString.contains('Host and target are the same. Nothing to install.')) { if (!stderrString.contains('Host and target are the same. Nothing to install.')) {
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;
}); });
} }
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

HIAST - GitLab