Move iOS content validation devicelab test into tool integration test (#142272)
The archiving was running in devicelab because certs are needed to codesign (see #73577). However now the certs are available in chromium bots. Move the archiving test into the existing tool integration test, and delete the devicelab variant. arm64: https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8757886514651624673/+/u/run_test.dart_for_tool_host_cross_arch_tests_shard_and_subshard_None/test_stdout#L6074_4 x64: https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8757886514651624689/+/u/run_test.dart_for_tool_host_cross_arch_tests_shard_and_subshard_None/test_stdout#L6389_2 Part of https://github.com/flutter/flutter/issues/142070
This commit is contained in:
Jenn Magder
GitHub
parent
cd60dd921d
commit
91f0878fed
19
.ci.yaml
19
.ci.yaml
@ -4520,25 +4520,6 @@ targets:
|
||||
["devicelab", "hostonly", "mac", "arm64"]
|
||||
task_name: ios_app_with_extensions_test
|
||||
|
||||
- name: Mac_x64_ios ios_content_validation_test
|
||||
recipe: devicelab/devicelab_drone
|
||||
bringup: true
|
||||
presubmit: false
|
||||
timeout: 60
|
||||
properties:
|
||||
tags: >
|
||||
["devicelab", "ios", "mac"]
|
||||
task_name: ios_content_validation_test
|
||||
|
||||
- name: Mac_arm64_ios ios_content_validation_test
|
||||
recipe: devicelab/devicelab_drone
|
||||
presubmit: false
|
||||
timeout: 60
|
||||
properties:
|
||||
tags: >
|
||||
["devicelab", "ios", "mac", "arm64"]
|
||||
task_name: ios_content_validation_test
|
||||
|
||||
- name: Mac_ios ios_defines_test
|
||||
recipe: devicelab/devicelab_drone
|
||||
presubmit: false
|
||||
|
||||
@ -195,7 +195,6 @@
|
||||
/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart @vashworth @flutter/tool
|
||||
/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart @vashworth @flutter/tool
|
||||
/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart @vashworth @flutter/tool
|
||||
/dev/devicelab/bin/tasks/ios_content_validation_test.dart @christopherfujino @flutter/tool
|
||||
/dev/devicelab/bin/tasks/ios_defines_test.dart @vashworth @flutter/tool
|
||||
/dev/devicelab/bin/tasks/ios_picture_cache_complexity_scoring_perf__timeline_summary.dart @flar @flutter/engine
|
||||
/dev/devicelab/bin/tasks/ios_platform_view_tests.dart @stuartmorgan @flutter/plugin
|
||||
|
||||
@ -1,118 +0,0 @@
|
||||
// Copyright 2014 The Flutter Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter_devicelab/framework/apk_utils.dart';
|
||||
import 'package:flutter_devicelab/framework/framework.dart';
|
||||
import 'package:flutter_devicelab/framework/task_result.dart';
|
||||
import 'package:flutter_devicelab/framework/utils.dart';
|
||||
import 'package:path/path.dart' as path;
|
||||
|
||||
Future<void> main() async {
|
||||
await task(() async {
|
||||
try {
|
||||
await runProjectTest((FlutterProject flutterProject) async {
|
||||
section('Archive');
|
||||
|
||||
await inDirectory(flutterProject.rootPath, () async {
|
||||
final File appIconFile = File(path.join(
|
||||
flutterProject.rootPath,
|
||||
'ios',
|
||||
'Runner',
|
||||
'Assets.xcassets',
|
||||
'AppIcon.appiconset',
|
||||
'Icon-App-20x20@1x.png',
|
||||
));
|
||||
// Resizes app icon to 123x456 (it is supposed to be 20x20).
|
||||
appIconFile.writeAsBytesSync(appIconFile.readAsBytesSync()
|
||||
..buffer.asByteData().setInt32(16, 123)
|
||||
..buffer.asByteData().setInt32(20, 456)
|
||||
);
|
||||
|
||||
final String output = await evalFlutter('build', options: <String>[
|
||||
'xcarchive',
|
||||
'-v',
|
||||
]);
|
||||
|
||||
// Note this isBot so usage won't actually be sent,
|
||||
// this log line is printed whenever the app is archived.
|
||||
if (!output.contains('Sending archive event if usage enabled')) {
|
||||
throw TaskResult.failure('Usage archive event not sent');
|
||||
}
|
||||
|
||||
// The output contains extra time related prefix, so cannot use a single string.
|
||||
const List<String> expectedValidationMessages = <String>[
|
||||
'[!] App Settings Validation\n',
|
||||
' • Version Number: 1.0.0\n',
|
||||
' • Build Number: 1\n',
|
||||
' • Display Name: Hello\n',
|
||||
' • Deployment Target: 12.0\n',
|
||||
' • Bundle Identifier: com.example.hello\n',
|
||||
' ! Your application still contains the default "com.example" bundle identifier.\n',
|
||||
'[!] App Icon and Launch Image Assets Validation\n',
|
||||
' ! App icon is set to the default placeholder icon. Replace with unique icons.\n',
|
||||
' ! App icon is using the incorrect size (e.g. Icon-App-20x20@1x.png).\n',
|
||||
' ! Launch image is set to the default placeholder icon. Replace with unique launch image.\n',
|
||||
'To update the settings, please refer to https://docs.flutter.dev/deployment/ios\n',
|
||||
];
|
||||
if (expectedValidationMessages.any((String message) => !output.contains(message))) {
|
||||
throw TaskResult.failure('Must have the expected validation message');
|
||||
}
|
||||
});
|
||||
|
||||
final String archivePath = path.join(
|
||||
flutterProject.rootPath,
|
||||
'build',
|
||||
'ios',
|
||||
'archive',
|
||||
'Runner.xcarchive',
|
||||
);
|
||||
|
||||
final String products = path.join(archivePath, 'Products');
|
||||
|
||||
checkDirectoryExists(products);
|
||||
|
||||
checkDirectoryExists(path.join(
|
||||
archivePath,
|
||||
'dSYMs',
|
||||
'Runner.app.dSYM',
|
||||
));
|
||||
final Directory applications = Directory(path.join(products, 'Applications'));
|
||||
|
||||
final Directory appBundle = applications
|
||||
.listSync()
|
||||
.whereType<Directory>()
|
||||
.singleWhere((Directory directory) => path.extension(directory.path) == '.app');
|
||||
|
||||
final String flutterFramework = path.join(
|
||||
appBundle.path,
|
||||
'Frameworks',
|
||||
'Flutter.framework',
|
||||
'Flutter',
|
||||
);
|
||||
// Exits 0 only if codesigned.
|
||||
final Future<String> flutterCodesign =
|
||||
eval('xcrun', <String>['codesign', '--verify', flutterFramework]);
|
||||
|
||||
final String appFramework = path.join(
|
||||
appBundle.path,
|
||||
'Frameworks',
|
||||
'App.framework',
|
||||
'App',
|
||||
);
|
||||
final Future<String> appCodesign =
|
||||
eval('xcrun', <String>['codesign', '--verify', appFramework]);
|
||||
await flutterCodesign;
|
||||
await appCodesign;
|
||||
});
|
||||
|
||||
return TaskResult.success(null);
|
||||
} on TaskResult catch (taskResult) {
|
||||
return taskResult;
|
||||
} catch (e) {
|
||||
return TaskResult.failure(e.toString());
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -354,7 +354,110 @@ void main() {
|
||||
expect(archs.stdout, contains('Mach-O 64-bit dynamically linked shared library x86_64'));
|
||||
expect(archs.stdout, contains('Mach-O 64-bit dynamically linked shared library arm64'));
|
||||
});
|
||||
|
||||
testWithoutContext('archive', () {
|
||||
final File appIconFile = fileSystem.file(fileSystem.path.join(
|
||||
projectRoot,
|
||||
'ios',
|
||||
'Runner',
|
||||
'Assets.xcassets',
|
||||
'AppIcon.appiconset',
|
||||
'Icon-App-20x20@1x.png',
|
||||
));
|
||||
// Resizes app icon to 123x456 (it is supposed to be 20x20).
|
||||
appIconFile.writeAsBytesSync(appIconFile.readAsBytesSync()
|
||||
..buffer.asByteData().setInt32(16, 123)
|
||||
..buffer.asByteData().setInt32(20, 456));
|
||||
|
||||
final ProcessResult output = processManager.runSync(
|
||||
<String>[
|
||||
flutterBin,
|
||||
...getLocalEngineArguments(),
|
||||
'build',
|
||||
'xcarchive',
|
||||
'--verbose',
|
||||
],
|
||||
workingDirectory: projectRoot,
|
||||
);
|
||||
|
||||
// Note this isBot so usage won't actually be sent,
|
||||
// this log line is printed whenever the app is archived.
|
||||
expect(output.stdout, contains('Sending archive event if usage enabled'));
|
||||
|
||||
// The output contains extra time related prefix, so cannot use a single string.
|
||||
const List<String> expectedValidationMessages = <String>[
|
||||
'[!] App Settings Validation\n',
|
||||
' • Version Number: 1.0.0\n',
|
||||
' • Build Number: 1\n',
|
||||
' • Display Name: Hello\n',
|
||||
' • Deployment Target: 12.0\n',
|
||||
' • Bundle Identifier: com.example.hello\n',
|
||||
' ! Your application still contains the default "com.example" bundle identifier.\n',
|
||||
'[!] App Icon and Launch Image Assets Validation\n',
|
||||
' ! App icon is set to the default placeholder icon. Replace with unique icons.\n',
|
||||
' ! App icon is using the incorrect size (e.g. Icon-App-20x20@1x.png).\n',
|
||||
' ! Launch image is set to the default placeholder icon. Replace with unique launch image.\n',
|
||||
'To update the settings, please refer to https://docs.flutter.dev/deployment/ios\n',
|
||||
];
|
||||
expect(expectedValidationMessages, unorderedEquals(expectedValidationMessages));
|
||||
|
||||
final Directory archivePath = fileSystem.directory(fileSystem.path.join(
|
||||
projectRoot,
|
||||
'build',
|
||||
'ios',
|
||||
'archive',
|
||||
'Runner.xcarchive',
|
||||
));
|
||||
|
||||
final Directory products = archivePath.childDirectory('Products');
|
||||
expect(products, exists);
|
||||
|
||||
final Directory dSYM = archivePath.childDirectory('dSYMs').childDirectory('Runner.app.dSYM');
|
||||
expect(dSYM, exists);
|
||||
|
||||
final Directory applications = products.childDirectory('Applications');
|
||||
|
||||
final Directory appBundle = applications
|
||||
.listSync()
|
||||
.whereType<Directory>()
|
||||
.singleWhere((Directory directory) => fileSystem.path.extension(directory.path) == '.app');
|
||||
|
||||
final String flutterFramework = fileSystem.path.join(
|
||||
appBundle.path,
|
||||
'Frameworks',
|
||||
'Flutter.framework',
|
||||
'Flutter',
|
||||
);
|
||||
|
||||
// Exits 0 only if codesigned.
|
||||
final ProcessResult flutterCodesign = processManager.runSync(
|
||||
<String>[
|
||||
'xcrun',
|
||||
'codesign',
|
||||
'--verify',
|
||||
flutterFramework,
|
||||
],
|
||||
);
|
||||
expect(flutterCodesign, const ProcessResultMatcher());
|
||||
|
||||
final String appFramework = fileSystem.path.join(
|
||||
appBundle.path,
|
||||
'Frameworks',
|
||||
'App.framework',
|
||||
'App',
|
||||
);
|
||||
|
||||
final ProcessResult appCodesign = processManager.runSync(
|
||||
<String>[
|
||||
'xcrun',
|
||||
'codesign',
|
||||
'--verify',
|
||||
appFramework,
|
||||
],
|
||||
);
|
||||
expect(appCodesign, const ProcessResultMatcher());
|
||||
});
|
||||
}, skip: !platform.isMacOS, // [intended] only makes sense for macos platform.
|
||||
timeout: const Timeout(Duration(minutes: 7))
|
||||
timeout: const Timeout(Duration(minutes: 10))
|
||||
);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user