Skip to content

Commit 68ccb03

Browse files
Revert "test(ui): Add critical tests run by Maestro (#3802)"
This reverts commit 4988d5b.
1 parent 5ec7b9c commit 68ccb03

File tree

13 files changed

+4
-363
lines changed

13 files changed

+4
-363
lines changed

.github/workflows/integration-tests-ui-critical.yml

-106
This file was deleted.

.github/workflows/system-tests-backend.yml

+3-30
Original file line numberDiff line numberDiff line change
@@ -46,46 +46,19 @@ jobs:
4646

4747
- name: Exclude android modules from build
4848
run: |
49-
sed -i \
50-
-e '/.*"sentry-android-ndk",/d' \
51-
-e '/.*"sentry-android",/d' \
52-
-e '/.*"sentry-compose",/d' \
53-
-e '/.*"sentry-android-core",/d' \
54-
-e '/.*"sentry-android-fragment",/d' \
55-
-e '/.*"sentry-android-navigation",/d' \
56-
-e '/.*"sentry-android-okhttp",/d' \
57-
-e '/.*"sentry-android-sqlite",/d' \
58-
-e '/.*"sentry-android-timber",/d' \
59-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' \
60-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
61-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
62-
-e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
63-
-e '/.*"sentry-samples:sentry-samples-android",/d' \
64-
-e '/.*"sentry-android-replay",/d' \
65-
settings.gradle.kts
49+
sed -i -e '/.*"sentry-android-ndk",/d' -e '/.*"sentry-android",/d' -e '/.*"sentry-compose",/d' -e '/.*"sentry-android-core",/d' -e '/.*"sentry-android-fragment",/d' -e '/.*"sentry-android-navigation",/d' -e '/.*"sentry-android-okhttp",/d' -e '/.*"sentry-android-sqlite",/d' -e '/.*"sentry-android-timber",/d' -e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' -e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' -e '/.*"sentry-android-integration-tests:test-app-sentry",/d' -e '/.*"sentry-samples:sentry-samples-android",/d' -e '/.*"sentry-android-replay",/d' settings.gradle.kts
6650
6751
- name: Exclude android modules from ignore list
6852
run: |
69-
sed -i \
70-
-e '/.*"sentry-uitest-android",/d' \
71-
-e '/.*"sentry-uitest-android-benchmark",/d' \
72-
-e '/.*"sentry-uitest-android-critical",/d' \
73-
-e '/.*"test-app-sentry",/d' \
74-
-e '/.*"sentry-samples-android",/d' \
75-
build.gradle.kts
53+
sed -i -e '/.*"sentry-uitest-android",/d' -e '/.*"sentry-uitest-android-benchmark",/d' -e '/.*"test-app-sentry",/d' -e '/.*"sentry-samples-android",/d' build.gradle.kts
7654
7755
- name: Build server jar
7856
run: |
7957
./gradlew :sentry-samples:${{ matrix.sample }}:bootJar
8058
8159
- name: Start server and run integration test for sentry-cli commands
8260
run: |
83-
test/system-test-sentry-server-start.sh \
84-
> sentry-mock-server.txt 2>&1 & \
85-
test/system-test-spring-server-start.sh "${{ matrix.sample }}" \
86-
> spring-server.txt 2>&1 & \
87-
test/wait-for-spring.sh && \
88-
./gradlew :sentry-samples:${{ matrix.sample }}:systemTest
61+
test/system-test-sentry-server-start.sh > sentry-mock-server.txt 2>&1 & test/system-test-spring-server-start.sh "${{ matrix.sample }}" > spring-server.txt 2>&1 & test/wait-for-spring.sh && ./gradlew :sentry-samples:${{ matrix.sample }}:systemTest
8962
9063
- name: Upload test results
9164
if: always()

Makefile

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: all clean compile javadocs dryRelease update stop checkFormat format api assembleBenchmarkTestRelease assembleUiTestRelease assembleUiTestCriticalRelease createCoverageReports runUiTestCritical check preMerge publish
1+
.PHONY: all clean compile javadocs dryRelease update stop checkFormat format api assembleBenchmarkTestRelease assembleUiTestRelease createCoverageReports check preMerge publish
22

33
all: stop clean javadocs compile createCoverageReports
44
assembleBenchmarks: assembleBenchmarkTestRelease
@@ -53,14 +53,6 @@ assembleUiTestRelease:
5353
./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleRelease
5454
./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleAndroidTest -DtestBuildType=release
5555

56-
# Assemble release of the uitest-android-critical module
57-
assembleUiTestCriticalRelease:
58-
./gradlew :sentry-android-integration-tests:sentry-uitest-android-critical:assembleRelease
59-
60-
# Run Maestro tests for the uitest-android-critical module
61-
runUiTestCritical:
62-
./scripts/test-ui-critical.sh
63-
6456
# Create coverage reports
6557
# - Jacoco for Java & Android modules
6658
# - Kover for KMP modules e.g sentry-compose

build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ apiValidation {
6868
"sentry-samples-spring-boot-webflux-jakarta",
6969
"sentry-uitest-android",
7070
"sentry-uitest-android-benchmark",
71-
"sentry-uitest-android-critical",
7271
"test-app-plain",
7372
"test-app-sentry",
7473
"sentry-samples-netflix-dgs"

scripts/test-ui-critical.sh

-35
This file was deleted.

sentry-android-integration-tests/sentry-uitest-android-critical/.gitignore

-2
This file was deleted.

sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts

-69
This file was deleted.

sentry-android-integration-tests/sentry-uitest-android-critical/maestro/corruptEnvelope.yaml

-11
This file was deleted.

sentry-android-integration-tests/sentry-uitest-android-critical/maestro/crash.yaml

-6
This file was deleted.

sentry-android-integration-tests/sentry-uitest-android-critical/proguard-rules.pro

-21
This file was deleted.

sentry-android-integration-tests/sentry-uitest-android-critical/src/main/AndroidManifest.xml

-21
This file was deleted.

0 commit comments

Comments
 (0)