Skip to content

Commit a9fd87c

Browse files
authored
test(bigtable): relax logging tests (#8062)
1 parent 3289f6a commit a9fd87c

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-9
lines changed

google/cloud/bigtable/admin/integration_tests/instance_admin_integration_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ TEST_F(InstanceAdminIntegrationTest,
478478
auto no_logging_client =
479479
BigtableInstanceAdminClient(MakeBigtableInstanceAdminConnection());
480480
(void)no_logging_client.ListInstances(project_name);
481-
EXPECT_THAT(log.ExtractLines(), IsEmpty());
481+
EXPECT_THAT(log.ExtractLines(), Not(Contains(HasSubstr("ListInstances"))));
482482
}
483483

484484
TEST_F(InstanceAdminIntegrationTest, CustomWorkers) {

google/cloud/bigtable/admin/integration_tests/table_admin_integration_test.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ namespace {
4141
using ::google::cloud::bigtable::testing::TableTestEnvironment;
4242
using ::testing::Contains;
4343
using ::testing::HasSubstr;
44-
using ::testing::IsEmpty;
4544
using ::testing::IsSupersetOf;
4645
using ::testing::Not;
4746

@@ -497,7 +496,7 @@ TEST_F(TableAdminIntegrationTest, CreateListGetDeleteTableWithLogging) {
497496
auto no_logging_client =
498497
BigtableTableAdminClient(MakeBigtableTableAdminConnection());
499498
(void)no_logging_client.ListTables(instance_name);
500-
EXPECT_THAT(log.ExtractLines(), IsEmpty());
499+
EXPECT_THAT(log.ExtractLines(), Not(Contains(HasSubstr("ListTables"))));
501500
}
502501

503502
} // namespace

google/cloud/bigtable/tests/admin_integration_test.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ namespace {
3434

3535
using ::testing::Contains;
3636
using ::testing::HasSubstr;
37-
using ::testing::IsEmpty;
3837
using ::testing::IsSupersetOf;
3938
using ::testing::Not;
4039

@@ -385,7 +384,7 @@ TEST_F(AdminIntegrationTest, CreateListGetDeleteTableWithLogging) {
385384
auto no_logging_client =
386385
TableAdmin(MakeAdminClient(project_id()), instance_id());
387386
(void)no_logging_client.ListTables(btadmin::Table::NAME_ONLY);
388-
EXPECT_THAT(log.ExtractLines(), IsEmpty());
387+
EXPECT_THAT(log.ExtractLines(), Not(Contains(HasSubstr("ListTables"))));
389388
}
390389

391390
} // namespace

google/cloud/bigtable/tests/data_integration_test.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ using ::std::chrono::microseconds;
3333
using ::std::chrono::milliseconds;
3434
using ::testing::Contains;
3535
using ::testing::HasSubstr;
36-
using ::testing::IsEmpty;
3736

3837
using DataIntegrationTest =
3938
::google::cloud::bigtable::testing::TableIntegrationTest;
@@ -538,7 +537,7 @@ TEST_F(DataIntegrationTest, TableApplyWithLogging) {
538537
auto no_logging_client =
539538
Table(MakeDataClient(project_id(), instance_id()), table_id);
540539
Apply(no_logging_client, row_key, created);
541-
EXPECT_THAT(log.ExtractLines(), IsEmpty());
540+
EXPECT_THAT(log.ExtractLines(), Not(Contains(HasSubstr("MutateRow"))));
542541
}
543542

544543
TEST(ConnectionRefresh, Disabled) {

google/cloud/bigtable/tests/instance_admin_integration_test.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ using ::google::cloud::internal::GetEnv;
3939
using ::google::cloud::testing_util::ContainsOnce;
4040
using ::testing::Contains;
4141
using ::testing::HasSubstr;
42-
using ::testing::IsEmpty;
4342
using ::testing::Not;
4443
namespace btadmin = ::google::bigtable::admin::v2;
4544

@@ -473,7 +472,7 @@ TEST_F(InstanceAdminIntegrationTest,
473472
// Verify that a normal client does not log.
474473
auto no_logging_client = InstanceAdmin(MakeInstanceAdminClient(project_id_));
475474
(void)no_logging_client.ListInstances();
476-
EXPECT_THAT(log.ExtractLines(), IsEmpty());
475+
EXPECT_THAT(log.ExtractLines(), Not(Contains(HasSubstr("ListInstances"))));
477476
}
478477

479478
TEST_F(InstanceAdminIntegrationTest, CustomWorkers) {

0 commit comments

Comments
 (0)