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
3ce6c1f4
Unverified
Commit
3ce6c1f4
authored
May 03, 2021
by
Dan Field
Committed by
GitHub
May 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter drive] Do not start dds if --no-dds (#81784)
parent
f33499df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
14 deletions
+21
-14
drive_service.dart
packages/flutter_tools/lib/src/drive/drive_service.dart
+15
-13
drive_service_test.dart
...er_tools/test/general.shard/drive/drive_service_test.dart
+6
-1
No files found.
packages/flutter_tools/lib/src/drive/drive_service.dart
View file @
3ce6c1f4
...
@@ -204,19 +204,21 @@ class FlutterDriverService extends DriverService {
...
@@ -204,19 +204,21 @@ class FlutterDriverService extends DriverService {
}
}
_vmServiceUri
=
uri
.
toString
();
_vmServiceUri
=
uri
.
toString
();
_device
=
device
;
_device
=
device
;
try
{
if
(
debuggingOptions
.
enableDds
)
{
await
device
.
dds
.
startDartDevelopmentService
(
try
{
uri
,
await
device
.
dds
.
startDartDevelopmentService
(
debuggingOptions
.
ddsPort
,
uri
,
ipv6
,
debuggingOptions
.
ddsPort
,
debuggingOptions
.
disableServiceAuthCodes
,
ipv6
,
logger:
_logger
,
debuggingOptions
.
disableServiceAuthCodes
,
);
logger:
_logger
,
_vmServiceUri
=
device
.
dds
.
uri
.
toString
();
);
}
on
dds
.
DartDevelopmentServiceException
{
_vmServiceUri
=
device
.
dds
.
uri
.
toString
();
// If there's another flutter_tools instance still connected to the target
}
on
dds
.
DartDevelopmentServiceException
{
// application, DDS will already be running remotely and this call will fail.
// If there's another flutter_tools instance still connected to the target
// This can be ignored to continue to use the existing remote DDS instance.
// application, DDS will already be running remotely and this call will fail.
// This can be ignored to continue to use the existing remote DDS instance.
}
}
}
_vmService
=
await
_vmServiceConnector
(
uri
,
device:
_device
);
_vmService
=
await
_vmServiceConnector
(
uri
,
device:
_device
);
final
DeviceLogReader
logReader
=
await
device
.
getLogReader
(
app:
_applicationPackage
);
final
DeviceLogReader
logReader
=
await
device
.
getLogReader
(
app:
_applicationPackage
);
...
...
packages/flutter_tools/test/general.shard/drive/drive_service_test.dart
View file @
3ce6c1f4
...
@@ -222,7 +222,7 @@ void main() {
...
@@ -222,7 +222,7 @@ void main() {
command:
<
String
>[
'dart'
,
'foo.test'
,
'-rexpanded'
],
command:
<
String
>[
'dart'
,
'foo.test'
,
'-rexpanded'
],
exitCode:
11
,
exitCode:
11
,
environment:
<
String
,
String
>{
environment:
<
String
,
String
>{
'VM_SERVICE_URL'
:
'http://127.0.0.1:
1234
/'
'VM_SERVICE_URL'
:
'http://127.0.0.1:
63426/1UasC_ihpXY=
/'
},
},
),
),
]);
]);
...
@@ -230,8 +230,12 @@ void main() {
...
@@ -230,8 +230,12 @@ void main() {
final
Device
device
=
FakeDevice
(
LaunchResult
.
succeeded
(
final
Device
device
=
FakeDevice
(
LaunchResult
.
succeeded
(
observatoryUri:
Uri
.
parse
(
'http://127.0.0.1:63426/1UasC_ihpXY=/'
),
observatoryUri:
Uri
.
parse
(
'http://127.0.0.1:63426/1UasC_ihpXY=/'
),
));
));
final
FakeDartDevelopmentService
dds
=
device
.
dds
as
FakeDartDevelopmentService
;
expect
(
dds
.
started
,
false
);
await
driverService
.
start
(
BuildInfo
.
profile
,
device
,
DebuggingOptions
.
enabled
(
BuildInfo
.
profile
,
enableDds:
false
),
true
);
await
driverService
.
start
(
BuildInfo
.
profile
,
device
,
DebuggingOptions
.
enabled
(
BuildInfo
.
profile
,
enableDds:
false
),
true
);
expect
(
dds
.
started
,
false
);
final
int
testResult
=
await
driverService
.
startTest
(
final
int
testResult
=
await
driverService
.
startTest
(
'foo.test'
,
'foo.test'
,
<
String
>[],
<
String
>[],
...
@@ -240,6 +244,7 @@ void main() {
...
@@ -240,6 +244,7 @@ void main() {
);
);
expect
(
testResult
,
11
);
expect
(
testResult
,
11
);
expect
(
dds
.
started
,
false
);
});
});
testWithoutContext
(
'Safely stops and uninstalls application'
,
()
async
{
testWithoutContext
(
'Safely stops and uninstalls application'
,
()
async
{
...
...
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