flutter/packages
1
0
Fork 0
mirror of https://github.com/flutter/packages.git synced 2025-07-02 08:34:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for core packages. (#140)

Browse Source 
* Add support for core packages.

Tests sometimes fail because they can't find packages from the core
images.

* Support test files ending in -0.far and .far files.

* If packages directory is passed then use pm from the same folder.
This commit is contained in:
godofredoc
2020-04-29 14:47:52 -07:00
committed by GitHub
parent 1bfed234ae
commit 054ec0075b
1 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
packages/fuchsia_ctl/bin/main.dart
View File

@ -97,7 +97,8 @@ Future<void> main(List<String> args) async {
..addMultiOption('far',
abbr: 'f', help: 'The .far files to include for the test.')
..addOption('timeout-seconds',
defaultsTo: '120', help: 'Test timeout in seconds.');
defaultsTo: '120', help: 'Test timeout in seconds.')
..addOption('packages-directory', help: 'amber files directory.');
final ArgResults results = parser.parse(args);
@ -256,26 +257,45 @@ Future<OperationResult> test(
ArgResults args,
) async {
const FileSystem fs = LocalFileSystem();
final String uuid = Uuid().v4();
final String identityFile = args['identity-file'];
final Directory repo = fs.systemTempDirectory.childDirectory('repo_$uuid');
final PackageServer server = PackageServer(args['pm-path']);
//final PackageServer server = PackageServer(args['pm-path']);
PackageServer server;
const SshClient ssh = SshClient();
final List<String> farFiles = args['far'];
final String target = args['target'];
final String arguments = args['arguments'];
Directory repo;
if (args['packages-directory'] == null) {
final String uuid = Uuid().v4();
repo = fs.systemTempDirectory.childDirectory('repo_$uuid');
server = PackageServer(args['pm-path']);
} else {
final String amberFilesPath = path.join(
args['packages-directory'],
'amber-files',
);
final String pmPath = path.join(
args['packages-directory'],
'pm',
);
repo = fs.directory(amberFilesPath);
server = PackageServer(pmPath);
}
try {
final String targetIp = await devFinder.getTargetAddress(deviceName);
final AmberCtl amberCtl = AmberCtl(targetIp, identityFile);
OperationResult result;
stdout.writeln('Using ${repo.path} as repo to serve to $targetIp...');
repo.createSync(recursive: true);
OperationResult result = await server.newRepo(repo.path);
if (!result.success) {
stderr.writeln('Failed to create repo at $repo.');
return result;
if (!repo.existsSync()) {
repo.createSync(recursive: true);
result = await server.newRepo(repo.path);
if (!result.success) {
stderr.writeln('Failed to create repo at $repo.');
return result;
}
}
await server.serveRepo(repo.path, port: 0);
await amberCtl.addSrc(server.serverPort);
@ -286,8 +306,8 @@ Future<OperationResult> test(
stderr.writeln(result.error);
return result;
}
final String packageName =
fs.file(farFile).basename.replaceFirst('-0.far', '');
final RegExp r = RegExp(r'\-0.far|.far');
final String packageName = fs.file(farFile).basename.replaceFirst(r, '');
await amberCtl.addPackage(packageName);
}
@ -312,7 +332,7 @@ Future<OperationResult> test(
return testResult;
} finally {
// We may not have created the repo if dev finder errored first.
if (repo.existsSync()) {
if (repo.existsSync() && args['packages-directory'] != null) {
repo.deleteSync(recursive: true);
}
if (server.serving) {