Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/android-device.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ jobs:
uses: actions/upload-artifact@v7
with:
name: junit-Android API ${{ inputs.api }}
overwrite: true
path: test-results/android-api${{ inputs.api }}/junit.xml
retention-days: 7
- name: Link evidence in job summary
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ jobs:
uses: actions/upload-artifact@v7
with:
name: junit-Native Go
overwrite: true
path: test-results/native/*.xml
retention-days: 7

Expand Down Expand Up @@ -121,6 +122,7 @@ jobs:
uses: actions/upload-artifact@v7
with:
name: junit-Python
overwrite: true
path: test-results/python/*.xml
retention-days: 7

Expand Down Expand Up @@ -175,6 +177,7 @@ jobs:
uses: actions/upload-artifact@v7
with:
name: junit-Android JVM
overwrite: true
path: app/build/test-results/testDebugUnitTest/*.xml
retention-days: 7

Expand Down
2 changes: 2 additions & 0 deletions app/src/test/java/net/megaproxy487/MainScreenUiTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class MainScreenUiTest : MainUiTestBase() {
val other = store.cloneProfile(store.activeProfileId())!!.copy(name = "Secondary")
store.saveProfile(other)
screen()
waitForText("Primary")
compose.onNodeWithText("Primary").performClick()
compose.onNodeWithText("Secondary").performClick()
saved()
Expand All @@ -107,6 +108,7 @@ class MainScreenUiTest : MainUiTestBase() {
.setInsets(WindowInsetsCompat.Type.navigationBars(), Insets.of(0, 0, 0, (200 * density).toInt()))
.build())
}
waitForText("Primary")
compose.onNodeWithText("Primary").performClick()
val menuBounds = compose.onNode(isPopup()).getUnclippedBoundsInRoot()
val menuHeight = menuBounds.bottom - menuBounds.top
Expand Down
5 changes: 5 additions & 0 deletions native/mobile/local_diagnostics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ func TestLocalResetNeverMarksProxyFailure(t *testing.T) {
t.Fatal(err)
}
defer listener.Close()
reset := make(chan struct{})
defer close(reset)
go func() {
c, err := listener.Accept()
if err != nil {
return
}
// Wait until Dial completes so RST exercises Read, not connection setup.
<-reset
_ = c.(*net.TCPConn).SetLinger(0)
_ = c.Close()
}()
Expand All @@ -44,6 +48,7 @@ func TestLocalResetNeverMarksProxyFailure(t *testing.T) {
t.Fatal(err)
}
defer connection.Close()
reset <- struct{}{}
_ = connection.SetReadDeadline(time.Now().Add(time.Second))
_, err = connection.Read(make([]byte, 1))
if err == nil {
Expand Down
Loading