Skip to content

Commit 81f628f

Browse files
authored
Migrate mac_test.dart to explicit-package-dependencies. (#160375)
Fixes forward <flutter/flutter#160257> that will happen when this flag is enabled ([example](https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8728366579836767153/+/u/run_test.dart_for_tool_tests_shard_and_subshard_general/stdout)).
1 parent f177d8a commit 81f628f

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

packages/flutter_tools/test/general.shard/ios/mac_test.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ import 'package:flutter_tools/src/base/logger.dart';
1212
import 'package:flutter_tools/src/base/process.dart';
1313
import 'package:flutter_tools/src/build_info.dart';
1414
import 'package:flutter_tools/src/cache.dart';
15+
import 'package:flutter_tools/src/dart/pub.dart';
1516
import 'package:flutter_tools/src/device.dart';
17+
import 'package:flutter_tools/src/features.dart';
1618
import 'package:flutter_tools/src/flutter_manifest.dart';
1719
import 'package:flutter_tools/src/ios/code_signing.dart';
1820
import 'package:flutter_tools/src/ios/mac.dart';
@@ -24,11 +26,18 @@ import 'package:unified_analytics/unified_analytics.dart';
2426
import '../../src/common.dart';
2527
import '../../src/context.dart';
2628
import '../../src/fake_process_manager.dart';
29+
import '../../src/fake_pub_deps.dart';
2730
import '../../src/fakes.dart';
2831

2932
void main() {
3033
late BufferLogger logger;
3134

35+
// TODO(matanlurey): Remove after `explicit-package-dependencies` is enabled by default.
36+
// See https://github.com/flutter/flutter/issues/160257 for details.
37+
FeatureFlags enableExplicitPackageDependencies() {
38+
return TestFeatureFlags(isExplicitPackageDependenciesEnabled: true);
39+
}
40+
3241
setUp(() {
3342
logger = BufferLogger.test();
3443
});
@@ -665,6 +674,8 @@ duplicate symbol '_$s29plugin_1_name23PluginNamePluginC9setDouble3key5valueySS_S
665674
));
666675
}, overrides: <Type, Generator>{
667676
ProcessManager: () => FakeProcessManager.any(),
677+
FeatureFlags: enableExplicitPackageDependencies,
678+
Pub: FakePubWithPrimedDeps.new,
668679
});
669680
});
670681

0 commit comments

Comments
 (0)