Skip to content

Commit b0c915b

Browse files
authored
ci: skip gcs prod tests creating public buckets (#15855)
1 parent 46f7e8b commit b0c915b

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

google/cloud/spanner/integration_tests/client_integration_test.cc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,15 +805,21 @@ TEST_F(ClientIntegrationTest, ReadLockModeOptionIsSent) {
805805
auto tx_a_read_result = client_->Read(
806806
tx_a, "Singers", KeySet().AddKey(MakeKey(singer_id)), {"SingerId"});
807807
for (auto const& row : StreamOf<std::tuple<std::int64_t>>(tx_a_read_result)) {
808-
EXPECT_STATUS_OK(row);
808+
EXPECT_THAT(
809+
row,
810+
AnyOf(IsOk(), StatusIs(StatusCode::kUnimplemented,
811+
HasSubstr("Optimistic lock is not enabled"))));
809812
}
810813
tx_a = MakeReadWriteTransaction(
811814
tx_a, Transaction::ReadWriteOptions(read_lock_mode));
812815

813816
auto optimistic_result =
814817
client_->Commit(tx_a, mutation_helper("SecondModifiedName"));
815818

816-
EXPECT_STATUS_OK(optimistic_result);
819+
EXPECT_THAT(
820+
optimistic_result,
821+
AnyOf(IsOk(), StatusIs(StatusCode::kUnimplemented,
822+
HasSubstr("Optimistic lock is not enabled"))));
817823
}
818824

819825
/// @test Test ExecuteQuery() with bounded staleness set by a timestamp.

google/cloud/storage/examples/storage_bucket_iam_samples.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,9 @@ void RunAll(std::vector<std::string> const& argv) {
328328
client, {bucket_name, "roles/storage.objectViewer", condition_title,
329329
condition_description, condition_expression});
330330

331-
std::cout << "\nRunning NativeSetBucketPublicIam() example" << std::endl;
332-
NativeSetBucketPublicIam(client, {bucket_name});
331+
// TODO(#15854): Enable this test when the issue is resolved.
332+
// std::cout << "\nRunning NativeSetBucketPublicIam() example" << std::endl;
333+
// NativeSetBucketPublicIam(client, {bucket_name});
333334

334335
if (!examples::UsingEmulator()) std::this_thread::sleep_until(pause);
335336
(void)examples::RemoveBucketAndContents(client, bucket_name);

google/cloud/storage/tests/bucket_acl_integration_test.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ TEST_F(BucketAclIntegrationTest, AclCRUD) {
154154
}
155155

156156
TEST_F(BucketAclIntegrationTest, CreatePredefinedAcl) {
157+
// TODO(#15854): Enable this test when the issue is resolved.
158+
if (!UsingEmulator()) GTEST_SKIP();
157159
std::vector<PredefinedAcl> test_values{
158160
PredefinedAcl::AuthenticatedRead(), PredefinedAcl::Private(),
159161
PredefinedAcl::ProjectPrivate(), PredefinedAcl::PublicRead(),

google/cloud/storage/tests/bucket_integration_test.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ TEST_F(BucketIntegrationTest, PatchLifecycleConditions) {
226226
}
227227

228228
TEST_F(BucketIntegrationTest, FullPatch) {
229+
// TODO(#15854): Enable this test when the issue is resolved.
230+
if (!UsingEmulator()) GTEST_SKIP();
229231
std::string bucket_name = MakeRandomBucketName();
230232
auto client = MakeBucketIntegrationTestClient();
231233

@@ -561,6 +563,8 @@ TEST_F(BucketIntegrationTest, GetMetadataIfMetagenerationNotMatchFailure) {
561563
}
562564

563565
TEST_F(BucketIntegrationTest, NativeIamCRUD) {
566+
// TODO(#15854): Enable this test when the issue is resolved.
567+
if (!UsingEmulator()) GTEST_SKIP();
564568
std::string bucket_name = MakeRandomBucketName();
565569
auto client = MakeBucketIntegrationTestClient();
566570

google/cloud/storage/tests/default_object_acl_integration_test.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ class DefaultObjectAclIntegrationTest
5353
};
5454

5555
TEST_F(DefaultObjectAclIntegrationTest, AclCRUD) {
56+
// TODO(#15854): Enable this test when the issue is resolved.
57+
if (!UsingEmulator()) GTEST_SKIP();
5658
std::string bucket_name = MakeRandomBucketName();
5759
auto client = MakeIntegrationTestClient(MakeBucketTestOptions());
5860

@@ -157,6 +159,8 @@ TEST_F(DefaultObjectAclIntegrationTest, AclCRUD) {
157159
}
158160

159161
TEST_F(DefaultObjectAclIntegrationTest, CreatePredefinedDefaultObjectAcl) {
162+
// TODO(#15854): Enable this test when the issue is resolved.
163+
if (!UsingEmulator()) GTEST_SKIP();
160164
std::vector<PredefinedDefaultObjectAcl> test_values{
161165
PredefinedDefaultObjectAcl::AuthenticatedRead(),
162166
PredefinedDefaultObjectAcl::BucketOwnerFullControl(),

0 commit comments

Comments
 (0)