Merge branch 'tooltipfollowup' of github.com:kenzieschmoll/devtools; branch 'master' of github.com:flutter/devtools into tooltipfollowup

Author: kenzieschmoll

packages/devtools_app/test/shared/eval_integration_test.dart

@@ -70,7 +70,7 @@ void main() {
           expect(instance2.classRef!.name, '_Future');
         },
         timeout: const Timeout.factor(2),
-        // TODO(https://github.com/flutter/devtools/issues/6998): if this flake
+        // TODO(https://github.com/flutter/devtools/issues/9484): if this flake
         // is addressed, we can unskip this for the Flutter customer tests.
         tags: skipForCustomerTestsTag,
       );
@@ -99,7 +99,7 @@ void main() {
           expect(instance.valueAsString, '42');
         },
         timeout: const Timeout.factor(2),
-        // TODO(https://github.com/flutter/devtools/issues/6998): if this flake
+        // TODO(https://github.com/flutter/devtools/issues/9484): if this flake
         // is addressed, we can unskip this for the Flutter customer tests.
         tags: skipForCustomerTestsTag,
       );
@@ -151,10 +151,12 @@ void main() {
           expect(error.valueAsString, 'foo');
         },
         timeout: const Timeout.factor(2),
-        // TODO(https://github.com/flutter/devtools/issues/6998): if this flake
+        // TODO(https://github.com/flutter/devtools/issues/9484): if this flake
         // is addressed, we can unskip this for the Flutter customer tests.
         tags: skipForCustomerTestsTag,
       );
-    });
+      // TODO(https://github.com/flutter/devtools/issues/9484): if this flake
+      // is addressed, we can remove the retry.
+    }, retry: 3);
   });
 }