Skip to content

Commit 43ceb39

Browse files
committed
Stabilize Android integration tests
NOTE: requires latest github-workflows: getsentry/github-workflows#137
1 parent 66979bb commit 43ceb39

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

.github/workflows/device-tests-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
130130
with:
131131
repository: getsentry/github-workflows
132-
ref: a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
132+
ref: f2f33e2f3eb80c9297d0dbcc22e68430e291f71a # main (TODO: v3.2.0)
133133
path: modules/github-workflows
134134

135135
- name: Run Integration Tests

integration-test/android.Tests.ps1

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ Describe 'MAUI app (<dotnet_version>, <configuration>)' -ForEach $cases -Skip:(-
137137

138138
Dump-ServerErrors -Result $result
139139
$result.HasErrors() | Should -BeFalse
140-
$result.Envelopes() | Should -AnyElementMatch "`"type`":`"System.ApplicationException`""
141-
$result.Envelopes() | Should -Not -AnyElementMatch "`"type`":`"SIGABRT`""
142-
$result.Envelopes() | Should -HaveCount 1
140+
$result.Events() | Should -AnyElementMatch "`"type`":`"System.ApplicationException`""
141+
$result.Events() | Should -Not -AnyElementMatch "`"type`":`"SIGABRT`""
142+
$result.Events() | Should -HaveCount 1
143143
}
144144

145145
It 'Java crash (<configuration>)' {
@@ -151,9 +151,9 @@ Describe 'MAUI app (<dotnet_version>, <configuration>)' -ForEach $cases -Skip:(-
151151

152152
Dump-ServerErrors -Result $result
153153
$result.HasErrors() | Should -BeFalse
154-
$result.Envelopes() | Should -AnyElementMatch "`"type`":`"RuntimeException`""
155-
$result.Envelopes() | Should -Not -AnyElementMatch "`"type`":`"System.\w+Exception`""
156-
$result.Envelopes() | Should -HaveCount 1
154+
$result.Events() | Should -AnyElementMatch "`"type`":`"RuntimeException`""
155+
$result.Events() | Should -Not -AnyElementMatch "`"type`":`"System.\w+Exception`""
156+
$result.Events() | Should -HaveCount 1
157157
}
158158

159159
It 'Native crash (<configuration>)' {
@@ -165,9 +165,9 @@ Describe 'MAUI app (<dotnet_version>, <configuration>)' -ForEach $cases -Skip:(-
165165

166166
Dump-ServerErrors -Result $result
167167
$result.HasErrors() | Should -BeFalse
168-
$result.Envelopes() | Should -AnyElementMatch "`"type`":`"SIG[A-Z]+`"" # SIGILL (x86_64), SIGTRAP (arm64-v8a)
169-
$result.Envelopes() | Should -Not -AnyElementMatch "`"type`":`"System.\w+Exception`""
170-
$result.Envelopes() | Should -HaveCount 1
168+
$result.Events() | Should -AnyElementMatch "`"type`":`"SIG[A-Z]+`"" # SIGILL (x86_64), SIGTRAP (arm64-v8a)
169+
$result.Events() | Should -Not -AnyElementMatch "`"type`":`"System.\w+Exception`""
170+
$result.Events() | Should -HaveCount 1
171171
}
172172

173173
It 'Null reference exception (<configuration>)' {
@@ -179,13 +179,13 @@ Describe 'MAUI app (<dotnet_version>, <configuration>)' -ForEach $cases -Skip:(-
179179

180180
Dump-ServerErrors -Result $result
181181
$result.HasErrors() | Should -BeFalse
182-
$result.Envelopes() | Should -AnyElementMatch "`"type`":`"System.NullReferenceException`""
182+
$result.Events() | Should -AnyElementMatch "`"type`":`"System.NullReferenceException`""
183183
# TODO: fix redundant SIGSEGV in Release (#3954)
184184
if ($configuration -eq "Release") {
185-
{ $result.Envelopes() | Should -Not -AnyElementMatch "`"type`":`"SIGSEGV`"" } | Should -Throw
185+
{ $result.Events() | Should -Not -AnyElementMatch "`"type`":`"SIGSEGV`"" } | Should -Throw
186186
} else {
187-
$result.Envelopes() | Should -Not -AnyElementMatch "`"type`":`"SIGSEGV`""
188-
$result.Envelopes() | Should -HaveCount 1
187+
$result.Events() | Should -Not -AnyElementMatch "`"type`":`"SIGSEGV`""
188+
$result.Events() | Should -HaveCount 1
189189
}
190190
}
191191

@@ -197,8 +197,8 @@ Describe 'MAUI app (<dotnet_version>, <configuration>)' -ForEach $cases -Skip:(-
197197

198198
Dump-ServerErrors -Result $result
199199
$result.HasErrors() | Should -BeFalse
200-
$result.Envelopes() | Should -AnyElementMatch "`"type`":`"system`",`"thread_id`":`"1`",`"category`":`"device.event`",`"action`":`"BATTERY_CHANGED`""
201-
$result.Envelopes() | Should -HaveCount 1
200+
$result.Events() | Should -AnyElementMatch "`"type`":`"system`",`"thread_id`":`"1`",`"category`":`"device.event`",`"action`":`"BATTERY_CHANGED`""
201+
$result.Events() | Should -HaveCount 1
202202
}
203203

204204
It 'Delivers network breadcrumbs in main thread (<configuration>)' {
@@ -209,7 +209,7 @@ Describe 'MAUI app (<dotnet_version>, <configuration>)' -ForEach $cases -Skip:(-
209209

210210
Dump-ServerErrors -Result $result
211211
$result.HasErrors() | Should -BeFalse
212-
$result.Envelopes() | Should -AnyElementMatch "`"type`":`"system`",`"thread_id`":`"1`",`"category`":`"network.event`",`"action`":`"NETWORK_CAPABILITIES_CHANGED`""
213-
$result.Envelopes() | Should -HaveCount 1
212+
$result.Events() | Should -AnyElementMatch "`"type`":`"system`",`"thread_id`":`"1`",`"category`":`"network.event`",`"action`":`"NETWORK_CAPABILITIES_CHANGED`""
213+
$result.Events() | Should -HaveCount 1
214214
}
215215
}

0 commit comments

Comments
 (0)