Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
dc20a606
Unverified
Commit
dc20a606
authored
Nov 02, 2021
by
Jenn Magder
Committed by
GitHub
Nov 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skip codesigning during native macOS integration tests (#92938)
parent
f729043c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
13 deletions
+34
-13
native_ui_tests_ios.dart
dev/devicelab/bin/tasks/native_ui_tests_ios.dart
+5
-1
native_ui_tests_macos.dart
dev/devicelab/bin/tasks/native_ui_tests_macos.dart
+6
-1
ios.dart
dev/devicelab/lib/framework/ios.dart
+17
-7
Podfile.lock
dev/integration_tests/flutter_gallery/macos/Podfile.lock
+1
-1
RunnerTests.m
...ion_tests/flutter_gallery/macos/RunnerTests/RunnerTests.m
+5
-3
No files found.
dev/devicelab/bin/tasks/native_ui_tests_ios.dart
View file @
dc20a606
...
@@ -36,7 +36,11 @@ Future<void> main() async {
...
@@ -36,7 +36,11 @@ Future<void> main() async {
section
(
'Run platform unit tests'
);
section
(
'Run platform unit tests'
);
final
Device
device
=
await
devices
.
workingDevice
;
final
Device
device
=
await
devices
.
workingDevice
;
if
(!
await
runXcodeTests
(
path
.
join
(
projectDirectory
,
'ios'
),
'id=
${device.deviceId}
'
,
'native_ui_tests_ios'
))
{
if
(!
await
runXcodeTests
(
platformDirectory:
path
.
join
(
projectDirectory
,
'ios'
),
destination:
'id=
${device.deviceId}
'
,
testName:
'native_ui_tests_ios'
,
))
{
return
TaskResult
.
failure
(
'Platform unit tests failed'
);
return
TaskResult
.
failure
(
'Platform unit tests failed'
);
}
}
...
...
dev/devicelab/bin/tasks/native_ui_tests_macos.dart
View file @
dc20a606
...
@@ -27,7 +27,12 @@ Future<void> main() async {
...
@@ -27,7 +27,12 @@ Future<void> main() async {
section
(
'Run platform unit tests'
);
section
(
'Run platform unit tests'
);
if
(!
await
runXcodeTests
(
path
.
join
(
projectDirectory
,
'macos'
),
'platform=macOS'
,
'native_ui_tests_macos'
))
{
if
(!
await
runXcodeTests
(
platformDirectory:
path
.
join
(
projectDirectory
,
'macos'
),
destination:
'platform=macOS'
,
testName:
'native_ui_tests_macos'
,
skipCodesign:
true
,
))
{
return
TaskResult
.
failure
(
'Platform unit tests failed'
);
return
TaskResult
.
failure
(
'Platform unit tests failed'
);
}
}
...
...
dev/devicelab/lib/framework/ios.dart
View file @
dc20a606
...
@@ -140,13 +140,22 @@ Future<void> removeIOSimulator(String deviceId) async {
...
@@ -140,13 +140,22 @@ Future<void> removeIOSimulator(String deviceId) async {
}
}
}
}
Future
<
bool
>
runXcodeTests
(
String
platformDirectory
,
String
destination
,
String
testName
)
async
{
Future
<
bool
>
runXcodeTests
({
required
String
platformDirectory
,
required
String
destination
,
required
String
testName
,
bool
skipCodesign
=
false
,
})
async
{
final
Map
<
String
,
String
>
environment
=
Platform
.
environment
;
final
Map
<
String
,
String
>
environment
=
Platform
.
environment
;
String
?
developmentTeam
;
String
?
codeSignStyle
;
String
?
provisioningProfile
;
if
(!
skipCodesign
)
{
// If not running on CI, inject the Flutter team code signing properties.
// If not running on CI, inject the Flutter team code signing properties.
final
String
developmentTeam
=
environment
[
'FLUTTER_XCODE_DEVELOPMENT_TEAM'
]
??
'S8QB4VV633'
;
developmentTeam
=
environment
[
'FLUTTER_XCODE_DEVELOPMENT_TEAM'
]
??
'S8QB4VV633'
;
final
String
?
codeSignStyle
=
environment
[
'FLUTTER_XCODE_CODE_SIGN_STYLE'
];
codeSignStyle
=
environment
[
'FLUTTER_XCODE_CODE_SIGN_STYLE'
];
final
String
?
provisioningProfile
=
environment
[
'FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER'
];
provisioningProfile
=
environment
[
'FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER'
];
}
final
String
resultBundleTemp
=
Directory
.
systemTemp
.
createTempSync
(
'flutter_xcresult.'
).
path
;
final
String
resultBundleTemp
=
Directory
.
systemTemp
.
createTempSync
(
'flutter_xcresult.'
).
path
;
final
String
resultBundlePath
=
path
.
join
(
resultBundleTemp
,
'result'
);
final
String
resultBundlePath
=
path
.
join
(
resultBundleTemp
,
'result'
);
final
int
testResultExit
=
await
exec
(
final
int
testResultExit
=
await
exec
(
...
@@ -164,6 +173,7 @@ Future<bool> runXcodeTests(String platformDirectory, String destination, String
...
@@ -164,6 +173,7 @@ Future<bool> runXcodeTests(String platformDirectory, String destination, String
resultBundlePath
,
resultBundlePath
,
'test'
,
'test'
,
'COMPILER_INDEX_STORE_ENABLE=NO'
,
'COMPILER_INDEX_STORE_ENABLE=NO'
,
if
(
developmentTeam
!=
null
)
'DEVELOPMENT_TEAM=
$developmentTeam
'
,
'DEVELOPMENT_TEAM=
$developmentTeam
'
,
if
(
codeSignStyle
!=
null
)
if
(
codeSignStyle
!=
null
)
'CODE_SIGN_STYLE=
$codeSignStyle
'
,
'CODE_SIGN_STYLE=
$codeSignStyle
'
,
...
...
dev/integration_tests/flutter_gallery/macos/Podfile.lock
View file @
dc20a606
...
@@ -32,4 +32,4 @@ SPEC CHECKSUMS:
...
@@ -32,4 +32,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: b5c36ba411e4471a03727d0463fa17be341876c1
PODFILE CHECKSUM: b5c36ba411e4471a03727d0463fa17be341876c1
COCOAPODS: 1.1
0
.2
COCOAPODS: 1.1
1
.2
dev/integration_tests/flutter_gallery/macos/RunnerTests/RunnerTests.m
View file @
dc20a606
...
@@ -18,9 +18,11 @@
...
@@ -18,9 +18,11 @@
NSMenu
*
mainMenu
=
NSApplication
.
sharedApplication
.
mainMenu
;
NSMenu
*
mainMenu
=
NSApplication
.
sharedApplication
.
mainMenu
;
XCTAssertEqual
([
mainMenu
indexOfItemWithSubmenu
:
applicationMenu
],
0
);
XCTAssertEqual
([
mainMenu
indexOfItemWithSubmenu
:
applicationMenu
],
0
);
XCTAssertEqual
([
mainMenu
itemWithTitle
:
@"Edit"
].
submenu
.
numberOfItems
,
19
);
// The number of submenu items changes depending on what the OS decides to inject.
XCTAssertEqual
([
mainMenu
itemWithTitle
:
@"View"
].
submenu
.
numberOfItems
,
1
);
// Just check there's at least one per menu item.
XCTAssertEqual
([
mainMenu
itemWithTitle
:
@"Window"
].
submenu
.
numberOfItems
,
6
);
XCTAssertGreaterThanOrEqual
([
mainMenu
itemWithTitle
:
@"Edit"
].
submenu
.
numberOfItems
,
1
);
XCTAssertGreaterThanOrEqual
([
mainMenu
itemWithTitle
:
@"View"
].
submenu
.
numberOfItems
,
1
);
XCTAssertGreaterThanOrEqual
([
mainMenu
itemWithTitle
:
@"Window"
].
submenu
.
numberOfItems
,
1
);
XCTAssertNil
(
NSApplication
.
sharedApplication
.
helpMenu
);
XCTAssertNil
(
NSApplication
.
sharedApplication
.
helpMenu
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment