@@ -316,9 +316,12 @@ TEST_F(FirebaseDynamicLinksTest, TestGetShortLinkFromComponents) {
316316 components.android_parameters = &android_parameters;
317317 components.social_meta_tag_parameters = &social_parameters;
318318
319- firebase::Future<firebase::dynamic_links::GeneratedDynamicLink> future =
320- firebase::dynamic_links::GetShortLink (components);
319+ firebase::Future<firebase::dynamic_links::GeneratedDynamicLink> future;
320+
321+ FLAKY_TEST_SECTION_BEGIN (); // Occasionally there can be a connection error.
322+ future = firebase::dynamic_links::GetShortLink (components);
321323 WaitForCompletion (future, " GetShortLinkFromComponents" );
324+ FLAKY_TEST_SECTION_END ();
322325
323326 if (is_desktop_stub_) {
324327 // On desktop, it's enough that we just don't crash.
@@ -395,9 +398,13 @@ TEST_F(FirebaseDynamicLinksTest, TestGetShortLinkFromLongLink) {
395398
396399 firebase::dynamic_links::DynamicLinkOptions options;
397400 options.path_length = firebase::dynamic_links::kPathLengthShort ;
398- firebase::Future<firebase::dynamic_links::GeneratedDynamicLink> future =
401+ firebase::Future<firebase::dynamic_links::GeneratedDynamicLink> future;
402+
403+ FLAKY_TEST_SECTION_BEGIN (); // Occasional connection errors.
404+ future =
399405 firebase::dynamic_links::GetShortLink (long_link.url .c_str (), options);
400406 WaitForCompletion (future, " GetShortLinkFromLongLink" );
407+ FLAKY_TEST_SECTION_END ();
401408
402409 const firebase::dynamic_links::GeneratedDynamicLink& generated_link =
403410 *future.result ();
@@ -572,17 +579,20 @@ TEST_F(FirebaseDynamicLinksTest, TestOpeningShortLinkFromLongLinkInRunningApp) {
572579 // Shorten link.
573580 firebase::dynamic_links::DynamicLinkOptions options;
574581 options.path_length = firebase::dynamic_links::kPathLengthShort ;
575- firebase::Future<firebase::dynamic_links::GeneratedDynamicLink> future =
582+ firebase::Future<firebase::dynamic_links::GeneratedDynamicLink> future;
583+
584+ FLAKY_TEST_SECTION_BEGIN (); // Occasional connection errors.
585+ future =
576586 firebase::dynamic_links::GetShortLink (long_link.url .c_str (), options);
587+ WaitForCompletion (future, " GetShortLinkFromLongLink" );
588+ FLAKY_TEST_SECTION_END ();
577589
578590 if (is_desktop_stub_) {
579591 // On desktop, it's enough that we just don't crash.
580592 LogDebug (" Succeeded as stub." );
581593 SUCCEED ();
582594 return ;
583595 }
584-
585- WaitForCompletion (future, " GetShortLinkFromLongLink" );
586596 const firebase::dynamic_links::GeneratedDynamicLink& link =
587597 *future.result ();
588598
@@ -648,8 +658,12 @@ TEST_F(FirebaseDynamicLinksTest,
648658 " components..." );
649659 firebase::dynamic_links::DynamicLinkComponents components =
650660 GenerateComponentsForTest (kUrlToOpen );
651- firebase::Future<firebase::dynamic_links::GeneratedDynamicLink> future =
652- firebase::dynamic_links::GetShortLink (components);
661+
662+ firebase::Future<firebase::dynamic_links::GeneratedDynamicLink> future;
663+ FLAKY_TEST_SECTION_BEGIN (); // Occasional connection errors.
664+ future = firebase::dynamic_links::GetShortLink (components);
665+ WaitForCompletion (future, " GetShortLinkFromLongLink" );
666+ FLAKY_TEST_SECTION_END (); // Occasional connection errors.
653667
654668 if (is_desktop_stub_) {
655669 // On desktop, it's enough that we just don't crash.
@@ -658,7 +672,6 @@ TEST_F(FirebaseDynamicLinksTest,
658672 return ;
659673 }
660674
661- WaitForCompletion (future, " GetShortLinkFromLongLink" );
662675 const firebase::dynamic_links::GeneratedDynamicLink& link =
663676 *future.result ();
664677
0 commit comments