Use different file names for ostream_output_stream_test and file_output_stream_test

Both tests write files with the same name to /tmp when running with CMake, and thus cannot run in parallel.

PiperOrigin-RevId: 513521067

2 files changed, 12 insertions, 6 deletions

diff --git a/cc/util/file_output_stream_test.cc b/cc/util/file_output_stream_test.cc
index 27e5aec67..522341e7f 100644
--- a/cc/util/file_output_stream_test.cc
+++ b/cc/util/file_output_stream_test.cc
@@ -84,7 +84,8 @@ TEST_F(FileOutputStreamTest, WritingStreams) {
   for (auto stream_size : {0, 10, 100, 1000, 10000, 100000, 1000000}) {
     SCOPED_TRACE(absl::StrCat("stream_size = ", stream_size));
     std::string stream_contents = subtle::Random::GetRandomBytes(stream_size);
-    std::string filename = absl::StrCat(stream_size, "_writing_test.bin");
+    std::string filename =
+        absl::StrCat(stream_size, "_file_output_stream_writing_test.bin");
     ASSERT_THAT(internal::CreateTestFile(filename, stream_contents), IsOk());
     util::StatusOr<int> output_fd = OpenTestFileToWrite(filename);
     ASSERT_THAT(output_fd.status(), IsOk());
@@ -102,7 +103,8 @@ TEST_F(FileOutputStreamTest, CustomBufferSizes) {
   std::string stream_contents = subtle::Random::GetRandomBytes(stream_size);
   for (auto buffer_size : {1, 10, 100, 1000, 10000, 100000, 1000000}) {
     SCOPED_TRACE(absl::StrCat("buffer_size = ", buffer_size));
-    std::string filename = absl::StrCat(buffer_size, "_buffer_size_test.bin");
+    std::string filename =
+        absl::StrCat(buffer_size, "_file_output_stream_buffer_size_test.bin");
     ASSERT_THAT(internal::CreateTestFile(filename, stream_contents), IsOk());
     util::StatusOr<int> output_fd = OpenTestFileToWrite(filename);
     ASSERT_THAT(output_fd.status(), IsOk());
@@ -127,7 +129,8 @@ TEST_F(FileOutputStreamTest, BackupAndPosition) {
   int buffer_size = 1234;
   void* buffer;
   std::string stream_contents = subtle::Random::GetRandomBytes(stream_size);
-  std::string filename = absl::StrCat(buffer_size, "_backup_test.bin");
+  std::string filename =
+      absl::StrCat(buffer_size, "_file_output_stream_backup_test.bin");
   ASSERT_THAT(internal::CreateTestFile(filename, stream_contents), IsOk());
   util::StatusOr<int> output_fd = OpenTestFileToWrite(filename);
   ASSERT_THAT(output_fd.status(), IsOk());
diff --git a/cc/util/ostream_output_stream_test.cc b/cc/util/ostream_output_stream_test.cc
index 30d695611..8d43f641d 100644
--- a/cc/util/ostream_output_stream_test.cc
+++ b/cc/util/ostream_output_stream_test.cc
@@ -77,7 +77,8 @@ TEST_F(OstreamOutputStreamTest, WritingStreams) {
   for (size_t stream_size : {0, 10, 100, 1000, 10000, 100000, 1000000}) {
     SCOPED_TRACE(absl::StrCat("stream_size = ", stream_size));
     std::string stream_contents = subtle::Random::GetRandomBytes(stream_size);
-    std::string filename = absl::StrCat(stream_size, "_writing_test.bin");
+    std::string filename =
+        absl::StrCat(stream_size, "_ostream_output_stream_writing_test.bin");
     auto output = GetTestOstream(filename);
     auto output_stream = absl::make_unique<util::OstreamOutputStream>(
         std::move(output));
@@ -94,7 +95,8 @@ TEST_F(OstreamOutputStreamTest, CustomBufferSizes) {
   std::string stream_contents = subtle::Random::GetRandomBytes(stream_size);
   for (int buffer_size : {1, 10, 100, 1000, 10000, 100000, 1000000}) {
     SCOPED_TRACE(absl::StrCat("buffer_size = ", buffer_size));
-    std::string filename = absl::StrCat(buffer_size, "_buffer_size_test.bin");
+    std::string filename = absl::StrCat(
+        buffer_size, "_ostream_output_stream_buffer_size_test.bin");
     auto output = GetTestOstream(filename);
     auto output_stream = absl::make_unique<util::OstreamOutputStream>(
         std::move(output), buffer_size);
@@ -116,7 +118,8 @@ TEST_F(OstreamOutputStreamTest, BackupAndPosition) {
   int buffer_size = 1234;
   void* buffer;
   std::string stream_contents = subtle::Random::GetRandomBytes(stream_size);
-  std::string filename = absl::StrCat(buffer_size, "_backup_test.bin");
+  std::string filename =
+      absl::StrCat(buffer_size, "_ostream_output_stream_backup_test.bin");
   auto output = GetTestOstream(filename);
 
   // Prepare the stream and do the first call to Next().