Avoid flaky replacements when filtering for goldens (#4794)
diff --git a/test/embedding/embedding_test.dart b/test/embedding/embedding_test.dart
index c5657a3..ee328ac 100644
--- a/test/embedding/embedding_test.dart
+++ b/test/embedding/embedding_test.dart
@@ -426,7 +426,9 @@
       .replaceAll(d.sandbox, r'$SANDBOX')
       .replaceAll(Platform.pathSeparator, '/')
       .replaceAll(Platform.operatingSystem, r'$OS')
-      .replaceAll(globalServer.port.toString(), r'$PORT')
+      .replaceAll(':${globalServer.port}', ':\$PORT')
+      .replaceAll('%58${globalServer.port}', '%58\$PORT')
+      .replaceAll('%2558${globalServer.port}', '%2558\$PORT')
       .replaceAll(RegExp(r'^Created:(.*)$', multiLine: true), r'Created: $TIME')
       .replaceAll(
         RegExp(r'Generated by pub on (.*)$', multiLine: true),
diff --git a/test/test_pub.dart b/test/test_pub.dart
index 9aa9343..c1ab8f2 100644
--- a/test/test_pub.dart
+++ b/test/test_pub.dart
@@ -937,7 +937,8 @@
       );
   final port = _globalServer?.port;
   if (port != null) {
-    input = input.replaceAll(port.toString(), '\$PORT');
+    input = input.replaceAll(':$port', ':\$PORT');
+    input = input.replaceAll('%58$port', '%58\$PORT');
   }
   return input;
 }