Skip to content

Commit 4f76aa5

Browse files
committed
Fix race condition when clearing cpu info utils in tests
1 parent 2521fe7 commit 4f76aa5

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/CpuInfoUtils.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,16 @@ String getSystemCpuPath() {
7575

7676
@TestOnly
7777
public void setCpuMaxFrequencies(List<Integer> frequencies) {
78-
cpuMaxFrequenciesMhz.clear();
79-
cpuMaxFrequenciesMhz.addAll(frequencies);
78+
try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
79+
cpuMaxFrequenciesMhz.clear();
80+
cpuMaxFrequenciesMhz.addAll(frequencies);
81+
}
8082
}
8183

8284
@TestOnly
83-
final void clear() {
84-
cpuMaxFrequenciesMhz.clear();
85+
public void clear() {
86+
try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
87+
cpuMaxFrequenciesMhz.clear();
88+
}
8589
}
8690
}

sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ class DefaultAndroidEventProcessorTest {
8787
context = ApplicationProvider.getApplicationContext()
8888
AppState.getInstance().resetInstance()
8989
DeviceInfoUtil.resetInstance()
90+
CpuInfoUtils.getInstance().clear()
9091
}
9192

9293
@Test

0 commit comments

Comments
 (0)