test(storage): deflake "plenty clients" tests

coryan · coryan · commit 3f7480c01631 · 2021-07-18T16:56:48.000Z
These tests are looking for leaks, but were failing when the number of
file descriptors *decreased*, they should only fail if they increased.
diff --git a/google/cloud/storage/tests/object_plenty_clients_serially_integration_test.cc b/google/cloud/storage/tests/object_plenty_clients_serially_integration_test.cc
@@ -85,7 +85,7 @@ TEST_F(ObjectPlentyClientsSeriallyIntegrationTest, PlentyClientsSerially) {
   if (track_open_files) {
     auto num_fds_after_test = GetNumOpenFiles();
     ASSERT_STATUS_OK(num_fds_after_test);
-    EXPECT_EQ(*num_fds_before_test, *num_fds_after_test)
+    EXPECT_GE(*num_fds_before_test, *num_fds_after_test)
         << "Clients are leaking descriptors";
   }
 }
diff --git a/google/cloud/storage/tests/object_plenty_clients_simultaneously_integration_test.cc b/google/cloud/storage/tests/object_plenty_clients_simultaneously_integration_test.cc
@@ -79,7 +79,7 @@ TEST_F(ObjectPlentyClientsSimultaneouslyIntegrationTest,
         << "Clients keeps at least some file descriptors open";
     EXPECT_LT(*num_fds_after_test, *num_fds_during_test)
         << "Releasing clients also releases at least some file descriptors";
-    EXPECT_EQ(*num_fds_before_test, *num_fds_after_test)
+    EXPECT_GE(*num_fds_before_test, *num_fds_after_test)
         << "Clients are leaking descriptors";
   } else {
     EXPECT_EQ(StatusCode::kUnimplemented, num_fds_before_test.status().code());

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ TEST_F(ObjectPlentyClientsSeriallyIntegrationTest, PlentyClientsSerially) {`
`85`	`85`	`if (track_open_files) {`
`86`	`86`	`auto num_fds_after_test = GetNumOpenFiles();`
`87`	`87`	`ASSERT_STATUS_OK(num_fds_after_test);`
`88`		`- EXPECT_EQ(num_fds_before_test, num_fds_after_test)`
	`88`	`+ EXPECT_GE(num_fds_before_test, num_fds_after_test)`
`89`	`89`	`<< "Clients are leaking descriptors";`
`90`	`90`	`}`
`91`	`91`	`}`