Skip to content

Commit 0f276da

Browse files
jonsimantovjonsimantov
authored
Add retry to SignInAnonymously to avoid network issues. (#1515)
1 parent eb9d3d7 commit 0f276da

File tree

1 file changed

+34
-30
lines changed

1 file changed

+34
-30
lines changed

‎auth/integration_test/src/integration_test.cc

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,19 @@ class FirebaseAuthTest : public FirebaseTest {
153153
}
154154
}
155155

156+
void SignInAnonymously() {
157+
FLAKY_TEST_SECTION_BEGIN();
158+
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
159+
FLAKY_TEST_SECTION_END();
160+
}
161+
162+
void SignInAnonymously_DEPRECATED() {
163+
FLAKY_TEST_SECTION_BEGIN();
164+
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
165+
"SignInAnonymously_DEPRECATED");
166+
FLAKY_TEST_SECTION_END();
167+
}
168+
156169
bool initialized_;
157170
firebase::auth::Auth* auth_;
158171
};
@@ -375,16 +388,15 @@ TEST_F(FirebaseAuthTest, TestInitialization) {
375388
TEST_F(FirebaseAuthTest, TestAnonymousSignin) {
376389
// Test notification on SignIn().
377390

378-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
391+
SignInAnonymously();
379392
EXPECT_TRUE(auth_->current_user().is_valid());
380393
EXPECT_TRUE(auth_->current_user().is_anonymous());
381394
DeleteUser();
382395
}
383396

384397
TEST_F(FirebaseAuthTest, TestAnonymousSignin_DEPRECATED) {
385398
// Test notification on SignIn().
386-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
387-
"SignInAnonymously_DEPRECATED");
399+
SignInAnonymously_DEPRECATED();
388400
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
389401
if (auth_->current_user_DEPRECATED() != nullptr) {
390402
EXPECT_TRUE(auth_->current_user_DEPRECATED()->is_anonymous());
@@ -476,7 +488,7 @@ TEST_F(FirebaseAuthTest, TestTokensAndAuthStateListeners) {
476488
TestIdTokenListener token_listener;
477489
auth_->AddAuthStateListener(&listener);
478490
auth_->AddIdTokenListener(&token_listener);
479-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
491+
SignInAnonymously();
480492
// Get an initial token.
481493
firebase::Future<std::string> token_future =
482494
auth_->current_user().GetToken(false);
@@ -631,7 +643,7 @@ TEST_F(FirebaseAuthTest, TestEmailAndPasswordSignin_DEPRECATED) {
631643
}
632644

633645
TEST_F(FirebaseAuthTest, TestCopyUser) {
634-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
646+
SignInAnonymously();
635647
EXPECT_TRUE(auth_->current_user().is_valid());
636648
if (!auth_->current_user().is_valid()) return;
637649

@@ -659,8 +671,7 @@ TEST_F(FirebaseAuthTest, TestCopyUser) {
659671
}
660672

661673
TEST_F(FirebaseAuthTest, TestCopyUser_DEPRECATED) {
662-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
663-
"SignInAnonymously_DEPRECATED");
674+
SignInAnonymously_DEPRECATED();
664675
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
665676
if (auth_->current_user_DEPRECATED() == nullptr) return;
666677

@@ -937,7 +948,7 @@ TEST_F(FirebaseAuthTest, TestUpdateEmailAndPassword_DEPRECATED) {
937948
}
938949

939950
TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential) {
940-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
951+
SignInAnonymously();
941952
firebase::auth::User user = auth_->current_user();
942953
EXPECT_TRUE(user.is_valid());
943954
std::string email = GenerateEmailAddress();
@@ -947,7 +958,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential) {
947958
WaitForCompletion(user.LinkWithCredential(credential), "LinkWithCredential");
948959
WaitForCompletion(user.Unlink(credential.provider().c_str()), "Unlink");
949960
SignOut();
950-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
961+
SignInAnonymously();
951962
user = auth_->current_user();
952963
EXPECT_TRUE(user.is_valid());
953964
std::string email1 = GenerateEmailAddress();
@@ -971,8 +982,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential) {
971982
}
972983

973984
TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential_DEPRECATED) {
974-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
975-
"SignInAnonymously_DEPRECATED");
985+
SignInAnonymously_DEPRECATED();
976986
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
977987
firebase::auth::User* user = auth_->current_user_DEPRECATED();
978988
std::string email = GenerateEmailAddress();
@@ -984,8 +994,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential_DEPRECATED) {
984994
WaitForCompletion(user->Unlink_DEPRECATED(credential.provider().c_str()),
985995
"Unlink");
986996
SignOut();
987-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
988-
"SignInAnonymously_DEPRECATED");
997+
SignInAnonymously_DEPRECATED();
989998
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
990999
std::string email1 = GenerateEmailAddress();
9911000
firebase::auth::Credential credential1 =
@@ -1006,7 +1015,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential_DEPRECATED) {
10061015
}
10071016

10081017
TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithBadCredential) {
1009-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
1018+
SignInAnonymously();
10101019
firebase::auth::User pre_link_user = auth_->current_user();
10111020
EXPECT_TRUE(pre_link_user.is_valid());
10121021
firebase::auth::Credential twitter_cred =
@@ -1023,8 +1032,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithBadCredential) {
10231032
}
10241033

10251034
TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithBadCredential_DEPRECATED) {
1026-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
1027-
"SignInAnonymously_DEPRECATED");
1035+
SignInAnonymously_DEPRECATED();
10281036
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
10291037
firebase::auth::User* pre_link_user = auth_->current_user_DEPRECATED();
10301038
firebase::auth::Credential twitter_cred =
@@ -1150,7 +1158,7 @@ TEST_F(FirebaseAuthTest, TestCreateUserWithExistingEmailFails_DEPRECATED) {
11501158

11511159
TEST_F(FirebaseAuthTest, TestSignInWithBadCredentials) {
11521160
// Get an anonymous user first.
1153-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
1161+
SignInAnonymously();
11541162
EXPECT_TRUE(auth_->current_user().is_valid());
11551163
// Hold on to the existing user, to make sure it is unchanged by bad signins.
11561164
firebase::auth::User existing_user = auth_->current_user();
@@ -1404,7 +1412,7 @@ TEST_F(FirebaseAuthTest, TestAuthPersistenceWithAnonymousSignin) {
14041412

14051413
FLAKY_TEST_SECTION_BEGIN();
14061414

1407-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
1415+
SignInAnonymously();
14081416
EXPECT_TRUE(auth_->current_user().is_valid());
14091417
EXPECT_TRUE(auth_->current_user().is_anonymous());
14101418
Terminate();
@@ -2108,7 +2116,7 @@ TEST_F(FirebaseAuthTest,
21082116
TEST_F(FirebaseAuthTest, TestSuccessfulLinkFederatedProviderNoScopes) {
21092117
SKIP_TEST_ON_DESKTOP;
21102118
TEST_REQUIRES_USER_INTERACTION;
2111-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
2119+
SignInAnonymously();
21122120
ASSERT_TRUE(auth_->current_user().is_valid());
21132121
const std::string provider_id =
21142122
firebase::auth::GoogleAuthProvider::kProviderId;
@@ -2125,8 +2133,7 @@ TEST_F(FirebaseAuthTest,
21252133
TestSuccessfulLinkFederatedProviderNoScopes_DEPRECATED) {
21262134
SKIP_TEST_ON_DESKTOP;
21272135
TEST_REQUIRES_USER_INTERACTION;
2128-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
2129-
"SignInAnonymously_DEPRECATED");
2136+
SignInAnonymously_DEPRECATED();
21302137
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
21312138
const std::string provider_id =
21322139
firebase::auth::GoogleAuthProvider::kProviderId;
@@ -2144,7 +2151,7 @@ TEST_F(FirebaseAuthTest,
21442151
SKIP_TEST_ON_DESKTOP;
21452152
TEST_REQUIRES_USER_INTERACTION;
21462153

2147-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
2154+
SignInAnonymously();
21482155
ASSERT_TRUE(auth_->current_user().is_valid());
21492156
const std::string provider_id =
21502157
firebase::auth::GoogleAuthProvider::kProviderId;
@@ -2163,8 +2170,7 @@ TEST_F(
21632170
SKIP_TEST_ON_DESKTOP;
21642171
TEST_REQUIRES_USER_INTERACTION;
21652172

2166-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
2167-
"SignInAnonymously_DEPRECATED");
2173+
SignInAnonymously_DEPRECATED();
21682174
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
21692175
const std::string provider_id =
21702176
firebase::auth::GoogleAuthProvider::kProviderId;
@@ -2181,7 +2187,7 @@ TEST_F(FirebaseAuthTest, TestSuccessfulLinkFederatedProvider) {
21812187
SKIP_TEST_ON_DESKTOP;
21822188
TEST_REQUIRES_USER_INTERACTION;
21832189

2184-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
2190+
SignInAnonymously();
21852191
ASSERT_TRUE(auth_->current_user().is_valid());
21862192
const std::string provider_id =
21872193
firebase::auth::GoogleAuthProvider::kProviderId;
@@ -2200,8 +2206,7 @@ TEST_F(FirebaseAuthTest, TestSuccessfulLinkFederatedProvider_DEPRECATED) {
22002206
SKIP_TEST_ON_DESKTOP;
22012207
TEST_REQUIRES_USER_INTERACTION;
22022208

2203-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
2204-
"SignInAnonymously_DEPRECATED");
2209+
SignInAnonymously_DEPRECATED();
22052210
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
22062211
const std::string provider_id =
22072212
firebase::auth::GoogleAuthProvider::kProviderId;
@@ -2220,7 +2225,7 @@ TEST_F(FirebaseAuthTest, TestLinkFederatedProviderBadProviderIdFails) {
22202225
SKIP_TEST_ON_DESKTOP;
22212226
TEST_REQUIRES_USER_INTERACTION;
22222227

2223-
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
2228+
SignInAnonymously();
22242229
ASSERT_TRUE(auth_->current_user().is_valid());
22252230
firebase::auth::FederatedOAuthProviderData provider_data(
22262231
/*provider=*/"MadeUpProvider",
@@ -2239,8 +2244,7 @@ TEST_F(FirebaseAuthTest,
22392244
SKIP_TEST_ON_DESKTOP;
22402245
TEST_REQUIRES_USER_INTERACTION;
22412246

2242-
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
2243-
"SignInAnonymously_DEPRECATED");
2247+
SignInAnonymously_DEPRECATED();
22442248
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
22452249
firebase::auth::FederatedOAuthProviderData provider_data(
22462250
/*provider=*/"MadeUpProvider",

0 commit comments

Comments
 (0)