Skip to content
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

Jump to bottom

chore: Reenable cquery e2e tests #245

Merged
merged 1 commit into from
Oct 11, 2024
Merged

chore: Reenable cquery e2e tests #245

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.bazel_diff.e2e
import assertk.assertThat
import assertk.assertions.isEqualTo
import com.bazel_diff.cli.BazelDiff
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
Expand Down Expand Up @@ -188,8 +187,6 @@ class E2ETest {
testFineGrainedHashBzlMod(listOf("--useCquery"), "@rules_jvm_external~~maven~maven", "/fixture/fine-grained-hash-bzlmod-cquery-test-impacted-targets.txt")
}

// TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
@Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
@Test
fun testUseCqueryWithExternalDependencyChange() {
// The difference between these two snapshots is simply upgrading the Guava version for Android platform.
Expand Down Expand Up @@ -292,8 +289,6 @@ class E2ETest {
assertThat(actual).isEqualTo(expected)
}

// TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
@Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
@Test
fun testUseCqueryWithAndroidCodeChange() {
// The difference between these two snapshots is simply making a code change to Android-only source code.
Expand Down
5 changes: 3 additions & 2 deletions cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
//src/main/java/com/integration:android
//src/main/java/com/integration:guava-user
@@//src/main/java/com/integration:android
@@//src/main/java/com/integration:android_deployjars_internal_rule
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit odd, but it doesn't seem to be due to --consistent_labels change made in #244

@@//src/main/java/com/integration:guava-user
Binary file modified cli/src/test/resources/fixture/cquery-test-android-code-change.zip
View file
Open in desktop
Binary file not shown.
Binary file modified cli/src/test/resources/fixture/cquery-test-base.zip
View file
Open in desktop
Binary file not shown.
13 changes: 7 additions & 6 deletions cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
//external:bazel_diff_maven_android
//src/main/java/com/integration:android
//src/main/java/com/integration:guava-user
@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations
@bazel_diff_maven_android//:com_google_guava_guava
@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations
@bazel_diff_maven_android//:org_checkerframework_checker_qual
@@//src/main/java/com/integration:android
@@//src/main/java/com/integration:android_deployjars_internal_rule
@@//src/main/java/com/integration:guava-user
@@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations
@@bazel_diff_maven_android//:com_google_guava_guava
@@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations
@@bazel_diff_maven_android//:org_checkerframework_checker_qual
Binary file modified cli/src/test/resources/fixture/cquery-test-guava-upgrade.zip
View file
Open in desktop
Binary file not shown.
Loading