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
d30ad47e
Unverified
Commit
d30ad47e
authored
Jun 09, 2022
by
Lau Ching Jun
Committed by
GitHub
Jun 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make flutter attach respect the `--dds-port` flag. (#105560)
parent
01822a48
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
131 additions
and
76 deletions
+131
-76
attach.dart
packages/flutter_tools/lib/src/commands/attach.dart
+1
-0
flutter_attach_test.dart
...ter_tools/test/integration.shard/flutter_attach_test.dart
+130
-76
No files found.
packages/flutter_tools/lib/src/commands/attach.dart
View file @
d30ad47e
...
@@ -428,6 +428,7 @@ known, it can be explicitly provided to attach via the command-line, e.g.
...
@@ -428,6 +428,7 @@ known, it can be explicitly provided to attach via the command-line, e.g.
final
DebuggingOptions
debuggingOptions
=
DebuggingOptions
.
enabled
(
final
DebuggingOptions
debuggingOptions
=
DebuggingOptions
.
enabled
(
buildInfo
,
buildInfo
,
enableDds:
enableDds
,
enableDds:
enableDds
,
ddsPort:
ddsPort
,
devToolsServerAddress:
devToolsServerAddress
,
devToolsServerAddress:
devToolsServerAddress
,
);
);
...
...
packages/flutter_tools/test/integration.shard/flutter_attach_test.dart
View file @
d30ad47e
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
// found in the LICENSE file.
// found in the LICENSE file.
import
'package:file/file.dart'
;
import
'package:file/file.dart'
;
import
'package:flutter_tools/src/base/io.dart'
;
import
'package:vm_service/vm_service.dart'
;
import
'package:vm_service/vm_service.dart'
;
import
'../src/common.dart'
;
import
'../src/common.dart'
;
...
@@ -10,14 +11,30 @@ import 'test_data/basic_project.dart';
...
@@ -10,14 +11,30 @@ import 'test_data/basic_project.dart';
import
'test_driver.dart'
;
import
'test_driver.dart'
;
import
'test_utils.dart'
;
import
'test_utils.dart'
;
Future
<
int
>
getFreePort
()
async
{
int
port
=
0
;
final
ServerSocket
serverSocket
=
await
ServerSocket
.
bind
(
InternetAddress
.
loopbackIPv4
,
0
);
port
=
serverSocket
.
port
;
await
serverSocket
.
close
();
return
port
;
}
void
main
(
)
{
void
main
(
)
{
late
FlutterRunTestDriver
flutterRun
,
flutterAttach
;
final
BasicProject
project
=
BasicProject
();
final
BasicProject
project
=
BasicProject
();
late
Directory
tempDir
;
late
Directory
tempDir
;
setUp
(()
async
{
setUp
(()
async
{
tempDir
=
createResolvedTempDirectorySync
(
'attach_test.'
);
tempDir
=
createResolvedTempDirectorySync
(
'attach_test.'
);
await
project
.
setUpIn
(
tempDir
);
await
project
.
setUpIn
(
tempDir
);
});
tearDown
(()
{
tryToDelete
(
tempDir
);
});
group
(
'DDS in flutter run'
,
()
{
late
FlutterRunTestDriver
flutterRun
,
flutterAttach
;
setUp
(()
{
flutterRun
=
FlutterRunTestDriver
(
tempDir
,
logPrefix:
' RUN '
);
flutterRun
=
FlutterRunTestDriver
(
tempDir
,
logPrefix:
' RUN '
);
flutterAttach
=
FlutterRunTestDriver
(
flutterAttach
=
FlutterRunTestDriver
(
tempDir
,
tempDir
,
...
@@ -32,7 +49,6 @@ void main() {
...
@@ -32,7 +49,6 @@ void main() {
tearDown
(()
async
{
tearDown
(()
async
{
await
flutterAttach
.
detach
();
await
flutterAttach
.
detach
();
await
flutterRun
.
stop
();
await
flutterRun
.
stop
();
tryToDelete
(
tempDir
);
});
});
testWithoutContext
(
'can hot reload'
,
()
async
{
testWithoutContext
(
'can hot reload'
,
()
async
{
...
@@ -103,4 +119,42 @@ void main() {
...
@@ -103,4 +119,42 @@ void main() {
matches:
equals
(
vmServiceUri
),
matches:
equals
(
vmServiceUri
),
);
);
});
});
});
group
(
'DDS in flutter attach'
,
()
{
late
FlutterRunTestDriver
flutterRun
,
flutterAttach
;
setUp
(()
{
flutterRun
=
FlutterRunTestDriver
(
tempDir
,
logPrefix:
' RUN '
,
spawnDdsInstance:
false
,
);
flutterAttach
=
FlutterRunTestDriver
(
tempDir
,
logPrefix:
'ATTACH '
,
);
});
tearDown
(()
async
{
await
flutterAttach
.
detach
();
await
flutterRun
.
stop
();
});
testWithoutContext
(
'uses the designated dds port'
,
()
async
{
final
int
ddsPort
=
await
getFreePort
();
await
flutterRun
.
run
(
withDebugger:
true
);
await
flutterAttach
.
attach
(
flutterRun
.
vmServicePort
!,
additionalCommandArgs:
<
String
>[
'--dds-port=
$ddsPort
'
,
],
);
final
Response
response
=
await
flutterAttach
.
callServiceExtension
(
'ext.flutter.connectedVmServiceUri'
);
final
String
vmServiceUriString
=
response
.
json
![
'value'
]
as
String
;
final
Uri
vmServiceUri
=
Uri
.
parse
(
vmServiceUriString
);
expect
(
vmServiceUri
.
port
,
equals
(
ddsPort
));
});
});
}
}
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