Skip to content

Jeremy flaky test #2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Jeremy flaky test #2813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11df213
update grpc version
Jul 2, 2021
ee57467
update guava as consequence of gRPC upgrade
Jul 7, 2021
ddfed7d
update minSdkVersion for gRPC upgrade
Jul 7, 2021
4499947
Attempt to fix flaky tests.
jeremyjiang-dev Jul 8, 2021
967dcad
Attempt to fix flaky tests.
jeremyjiang-dev Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ext {
playServicesVersion = '16.0.1'
supportAnnotationsVersion = '28.0.0'
googleTruthVersion = '0.45'
grpcVersion = '1.28.0'
grpcVersion = '1.38.0'
robolectricVersion = '4.3.1'
protocVersion = '3.14.0'
javaliteVersion = '3.14.0'
Expand Down
2 changes: 1 addition & 1 deletion firebase-firestore/firebase-firestore.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ configurations.all {
if(it.name.contains('AndroidTestRuntimeClasspath')) {
it.resolutionStrategy {
force 'org.checkerframework:checker-compat-qual:2.5.5'
force 'com.google.guava:guava:28.1-android'
force 'com.google.guava:guava:30.1-android'
}
}
exclude group: "com.google.protobuf", module: "protobuf-java"
Expand Down
2 changes: 1 addition & 1 deletion firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ dependencies {
testImplementation "org.mockito:mockito-core:2.25.0"
testImplementation "com.google.truth:truth:1.0"
testImplementation 'androidx.test:core:1.2.0'
testImplementation 'com.google.guava:guava:27.1-android'
testImplementation 'com.google.guava:guava:30.1-android'

androidTestImplementation "org.mockito:mockito-core:2.25.0"
androidTestImplementation "com.google.dexmaker:dexmaker:1.2"
Expand Down
4 changes: 2 additions & 2 deletions firebase-inappmessaging/firebase-inappmessaging.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ configurations.all {
if(it.name.contains('AndroidTestRuntimeClasspath')) {
it.resolutionStrategy {
force 'org.checkerframework:checker-compat-qual:2.5.5'
force 'com.google.guava:guava:28.1-android'
force 'com.google.guava:guava:30.1-android'
}
}
}
Expand Down Expand Up @@ -152,7 +152,7 @@ dependencies {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}
testImplementation "io.grpc:grpc-testing:$grpcVersion"
testImplementation 'com.google.guava:guava:27.1-android'
testImplementation 'com.google.guava:guava:30.1-android'
testImplementation 'androidx.test:core:1.2.0'

androidTestImplementation 'junit:junit:4.12'
Expand Down
5 changes: 3 additions & 2 deletions firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,11 +545,12 @@ private FirebasePerformance initializeFirebasePerformancePreferences(
Boolean sharedPreferencesEnabledDisabledKey,
Provider<RemoteConfigComponent> firebaseRemoteConfigProvider,
Provider<TransportFactory> transportFactoryProvider) {
DeviceCacheManager deviceCacheManager = new DeviceCacheManager(fakeDirectExecutorService);
deviceCacheManager.setContext(ApplicationProvider.getApplicationContext());
if (sharedPreferencesEnabledDisabledKey != null) {
DeviceCacheManager deviceCacheManager = new DeviceCacheManager(fakeDirectExecutorService);
deviceCacheManager.setContext(ApplicationProvider.getApplicationContext());
deviceCacheManager.setValue(Constants.ENABLE_DISABLE, sharedPreferencesEnabledDisabledKey);
}
spyConfigResolver.setDeviceCacheManager(deviceCacheManager);

Bundle bundle = new Bundle();
if (metadataFireperfEnabledKey != null) {
Expand Down
2 changes: 1 addition & 1 deletion sdkProperties.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

ext {
targetSdkVersion = 29
minSdkVersion = 14
minSdkVersion = 16
}