@@ -316,9 +316,12 @@ TEST_F(FirebaseDynamicLinksTest, TestGetShortLinkFromComponents) {
316
316
components.android_parameters = &android_parameters;
317
317
components.social_meta_tag_parameters = &social_parameters;
318
318
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);
321
323
WaitForCompletion (future, " GetShortLinkFromComponents" );
324
+ FLAKY_TEST_SECTION_END ();
322
325
323
326
if (is_desktop_stub_) {
324
327
// On desktop, it's enough that we just don't crash.
@@ -395,9 +398,13 @@ TEST_F(FirebaseDynamicLinksTest, TestGetShortLinkFromLongLink) {
395
398
396
399
firebase::dynamic_links::DynamicLinkOptions options;
397
400
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 =
399
405
firebase::dynamic_links::GetShortLink (long_link.url .c_str (), options);
400
406
WaitForCompletion (future, " GetShortLinkFromLongLink" );
407
+ FLAKY_TEST_SECTION_END ();
401
408
402
409
const firebase::dynamic_links::GeneratedDynamicLink& generated_link =
403
410
*future.result ();
@@ -572,17 +579,20 @@ TEST_F(FirebaseDynamicLinksTest, TestOpeningShortLinkFromLongLinkInRunningApp) {
572
579
// Shorten link.
573
580
firebase::dynamic_links::DynamicLinkOptions options;
574
581
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 =
576
586
firebase::dynamic_links::GetShortLink (long_link.url .c_str (), options);
587
+ WaitForCompletion (future, " GetShortLinkFromLongLink" );
588
+ FLAKY_TEST_SECTION_END ();
577
589
578
590
if (is_desktop_stub_) {
579
591
// On desktop, it's enough that we just don't crash.
580
592
LogDebug (" Succeeded as stub." );
581
593
SUCCEED ();
582
594
return ;
583
595
}
584
-
585
- WaitForCompletion (future, " GetShortLinkFromLongLink" );
586
596
const firebase::dynamic_links::GeneratedDynamicLink& link =
587
597
*future.result ();
588
598
@@ -648,8 +658,12 @@ TEST_F(FirebaseDynamicLinksTest,
648
658
" components..." );
649
659
firebase::dynamic_links::DynamicLinkComponents components =
650
660
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.
653
667
654
668
if (is_desktop_stub_) {
655
669
// On desktop, it's enough that we just don't crash.
@@ -658,7 +672,6 @@ TEST_F(FirebaseDynamicLinksTest,
658
672
return ;
659
673
}
660
674
661
- WaitForCompletion (future, " GetShortLinkFromLongLink" );
662
675
const firebase::dynamic_links::GeneratedDynamicLink& link =
663
676
*future.result ();
664
677
0 commit comments