Skip to content

test: fix directpath tests #2556

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

Merged
merged 5 commits into from
Apr 5, 2025
Merged

test: fix directpath tests #2556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f5d741
test: empty pr to test new presubmit
igorbernstein2 Apr 3, 2025
03f633a
debug broken test
igorbernstein2 Apr 3, 2025
eb76c19
exclude btql from directpath tests
igorbernstein2 Apr 4, 2025
94008a3
now that non-default service accounts are supported by directpath, st…
igorbernstein2 Apr 4, 2025
6d863de
remove unnecessary code
igorbernstein2 Apr 4, 2025
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
6 changes: 1 addition & 5 deletions ...oud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
import static com.google.common.truth.TruthJUnit.assume;

import com.google.api.core.ApiFunction;
import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.auth.oauth2.ComputeEngineCredentials;
import com.google.cloud.bigtable.data.v2.BigtableDataClient;
import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
import com.google.cloud.bigtable.test_helpers.env.AbstractTestEnv.ConnectionMode;
Expand Down Expand Up @@ -127,9 +125,7 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder builder) {

settingsBuilder
.stubSettings()
.setTransportChannelProvider(instrumentedTransportChannelProvider)
// Forcefully ignore GOOGLE_APPLICATION_CREDENTIALS
.setCredentialsProvider(FixedCredentialsProvider.create(ComputeEngineCredentials.create()));
.setTransportChannelProvider(instrumentedTransportChannelProvider);

instrumentedClient = BigtableDataClient.create(settingsBuilder.build());
}
Expand Down
7 changes: 7 additions & 0 deletions google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ExecuteQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.google.cloud.bigtable.data.v2.models.sql.ResultSet;
import com.google.cloud.bigtable.data.v2.models.sql.SqlType;
import com.google.cloud.bigtable.data.v2.models.sql.Struct;
import com.google.cloud.bigtable.test_helpers.env.AbstractTestEnv;
import com.google.cloud.bigtable.test_helpers.env.EmulatorEnv;
import com.google.cloud.bigtable.test_helpers.env.TestEnvRule;
import com.google.protobuf.ByteString;
Expand Down Expand Up @@ -59,6 +60,12 @@ public static void setUpAll() throws IOException {
.withMessage("ExecuteQuery is not supported on Emulator")
.that(testEnvRule.env())
.isNotInstanceOf(EmulatorEnv.class);
assume()
.withMessage("ExecuteQuery only works over CloudPath")
.that(testEnvRule.env().getConnectionMode())
.isNoneOf(
AbstractTestEnv.ConnectionMode.REQUIRE_DIRECT_PATH,
AbstractTestEnv.ConnectionMode.REQUIRE_DIRECT_PATH_IPV4);

tableId = testEnvRule.env().getTableId();
dataClient = testEnvRule.env().getDataClient();
Expand Down
Loading