Skip to content

Bug 2000191: fix intermittent test failure caused by race condition. #243

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

Open
pollym wants to merge 1 commit into
base: autoland
Choose a base branch
from
+13 −11
Open

Bug 2000191: fix intermittent test failure caused by race condition. #243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions ...tabs/src/test/java/mozilla/components/feature/syncedtabs/storage/SyncedTabsStorageTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ class SyncedTabsStorageTest {
store = BrowserStore(
BrowserState(
tabs = listOf(
createTab(id = "tab1", url = "https://www.mozilla.org", lastAccess = 123L),
createTab(id = "tab2", url = "https://www.foo.bar", lastAccess = 124L),
createTab(id = "tab1", url = "https://www.mozilla.org", lastAccess = 123L, createdAt = 123L),
createTab(id = "tab2", url = "https://www.foo.bar", lastAccess = 124L, createdAt = 124L),
createTab(
id = "private",
url = "https://private.tab",
private = true,
lastAccess = 125L,
createdAt = 125L,
),
),
selectedTabId = "tab1",
Expand Down Expand Up @@ -264,8 +265,8 @@ class SyncedTabsStorageTest {
val store = BrowserStore(
BrowserState(
tabs = listOf(
createTab(id = "tab1", url = "https://www.mozilla.org", lastAccess = 123L),
createTab(id = "tab2", url = "https://www.foo.bar", lastAccess = 124L),
createTab(id = "tab1", url = "https://www.mozilla.org", lastAccess = 123L, createdAt = 123L),
createTab(id = "tab2", url = "https://www.foo.bar", lastAccess = 124L, createdAt = 124L),
),
selectedTabId = "tab1",
),
Expand Down Expand Up @@ -305,8 +306,8 @@ class SyncedTabsStorageTest {
val store = BrowserStore(
BrowserState(
tabs = listOf(
createUnloadedTab(id = "tab1", url = "https://www.mozilla.org", lastAccess = 123L),
createUnloadedTab(id = "tab2", url = "https://www.foo.bar", lastAccess = 124L),
createUnloadedTab(id = "tab1", url = "https://www.mozilla.org", lastAccess = 123L, createdAt = 123L),
createUnloadedTab(id = "tab2", url = "https://www.foo.bar", lastAccess = 124L, createdAt = 124L),
),
selectedTabId = "tab1",
),
Expand Down Expand Up @@ -373,8 +374,8 @@ class SyncedTabsStorageTest {
val store = BrowserStore(
BrowserState(
tabs = listOf(
createTab(id = "tab1", url = "https://www.mozilla.org", lastAccess = 123L),
createTab(id = "tab2", url = "https://www.foo.bar", lastAccess = 124L),
createTab(id = "tab1", url = "https://www.mozilla.org", lastAccess = 123L, createdAt = 123L),
createTab(id = "tab2", url = "https://www.foo.bar", lastAccess = 124L, createdAt = 124L),
),
selectedTabId = "tab1",
),
Expand Down Expand Up @@ -409,7 +410,8 @@ class SyncedTabsStorageTest {
)
}

private fun createUnloadedTab(id: String, url: String, lastAccess: Long) = createTab(id = id, url = url, lastAccess = lastAccess).run {
copy(content = this.content.copy(loading = true))
}
private fun createUnloadedTab(id: String, url: String, lastAccess: Long, createdAt: Long = lastAccess) =
createTab(id = id, url = url, lastAccess = lastAccess, createdAt = createdAt).run {
copy(content = this.content.copy(loading = true))
}
}
Loading