feedback

srawlins · srawlins · commit 3d818621b9b9 · 2025-07-21T07:25:21.000-07:00
diff --git a/packages/devtools_app/integration_test/test/live_connection/app_test.dart b/packages/devtools_app/integration_test/test/live_connection/app_test.dart
@@ -8,8 +8,6 @@ import 'package:devtools_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
-
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/app_test.dart
 
diff --git a/packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart b/packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart
@@ -13,8 +13,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
-
 // To run the test while connected to a flutter-tester device:
 // dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/debugger_panel_test.dart
 
diff --git a/packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart b/packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart
@@ -20,8 +20,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
-
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/devtools_extensions_test.dart
 
diff --git a/packages/devtools_app/integration_test/test/live_connection/eval_and_browse_test.dart b/packages/devtools_app/integration_test/test/live_connection/eval_and_browse_test.dart
@@ -10,7 +10,6 @@ import 'package:devtools_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
 import 'eval_utils.dart';
 import 'memory_screen_helpers.dart';
 
diff --git a/packages/devtools_app/integration_test/test/live_connection/eval_and_inspect_test.dart b/packages/devtools_app/integration_test/test/live_connection/eval_and_inspect_test.dart
@@ -10,7 +10,6 @@ import 'package:devtools_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
 import 'eval_utils.dart';
 
 // To run the test while connected to a flutter-tester device:
diff --git a/packages/devtools_app/integration_test/test/live_connection/export_snapshot_test.dart b/packages/devtools_app/integration_test/test/live_connection/export_snapshot_test.dart
@@ -6,7 +6,6 @@ import 'package:devtools_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
 import 'memory_screen_helpers.dart';
 
 // To run:
diff --git a/packages/devtools_app/integration_test/test/live_connection/performance_screen_event_recording_test.dart b/packages/devtools_app/integration_test/test/live_connection/performance_screen_event_recording_test.dart
@@ -11,8 +11,6 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:vm_service_protos/vm_service_protos.dart';
 
-import '../../test_infra/run/_utils.dart';
-
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/performance_screen_event_recording_test.dart
 
diff --git a/packages/devtools_app/integration_test/test/live_connection/service_connection_test.dart b/packages/devtools_app/integration_test/test/live_connection/service_connection_test.dart
@@ -10,8 +10,6 @@ import 'package:devtools_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
-
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/service_connection_test.dart
 
diff --git a/packages/devtools_app/integration_test/test/live_connection/service_extensions_test.dart b/packages/devtools_app/integration_test/test/live_connection/service_extensions_test.dart
@@ -18,8 +18,6 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_infra/run/_utils.dart';
-
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/service_extensions_test.dart
 
diff --git a/packages/devtools_app/integration_test/test/offline/memory_offline_data_test.dart b/packages/devtools_app/integration_test/test/offline/memory_offline_data_test.dart
@@ -8,8 +8,6 @@ import 'package:devtools_test/test_data.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
-
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/offline/memory_offline_data_test.dart
 
diff --git a/packages/devtools_app/integration_test/test/offline/perfetto_test.dart b/packages/devtools_app/integration_test/test/offline/perfetto_test.dart
@@ -11,8 +11,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
-import '../../test_infra/run/_utils.dart';
-
 // To run:
 // dart run integration_test/run_tests.dart --target=integration_test/test/offline/perfetto_test.dart
 
diff --git a/packages/devtools_app/integration_test/test_infra/run/_utils.dart b/packages/devtools_app/integration_test/test_infra/run/_utils.dart
@@ -4,33 +4,10 @@
 
 // ignore_for_file: avoid_print
 
-/// @docImport 'package:flutter_test/flutter_test.dart';
-library;
-
-import 'package:test/test.dart' show Timeout;
-
 bool debugTestScript = false;
 
 void debugLog(String log) {
   if (debugTestScript) {
     print(log);
   }
 }
-
-/// A timeout for a "short" integration test.
-///
-/// Adjust as needed; this is used to override the 10-minute or infinite timeout
-/// in [testWidgets].
-const Timeout shortTimeout = Timeout(Duration(minutes: 2));
-
-/// A timeout for a "medium" integration test.
-///
-/// Adjust as needed; this is used to override the 10-minute or infinite timeout
-/// in [testWidgets].
-const Timeout mediumTimeout = Timeout(Duration(minutes: 3));
-
-/// A timeout for a "long" integration test.
-///
-/// Adjust as needed; this is used to override the 10-minute or infinite timeout
-/// in [testWidgets].
-const Timeout longTimeout = Timeout(Duration(minutes: 4));
diff --git a/packages/devtools_test/lib/src/integration_test/integration_test_utils.dart b/packages/devtools_test/lib/src/integration_test/integration_test_utils.dart
@@ -157,3 +157,21 @@ Future<void> verifyScreenshot(
     'last_screenshot': lastScreenshot,
   });
 }
+
+/// A timeout for a "short" integration test.
+///
+/// Adjust as needed; this is used to override the 10-minute or infinite timeout
+/// in [testWidgets].
+const Timeout shortTimeout = Timeout(Duration(minutes: 2));
+
+/// A timeout for a "medium" integration test.
+///
+/// Adjust as needed; this is used to override the 10-minute or infinite timeout
+/// in [testWidgets].
+const Timeout mediumTimeout = Timeout(Duration(minutes: 3));
+
+/// A timeout for a "long" integration test.
+///
+/// Adjust as needed; this is used to override the 10-minute or infinite timeout
+/// in [testWidgets].
+const Timeout longTimeout = Timeout(Duration(minutes: 4));
