Change FileExists to return tensorflow::Status.

Also done separately by @llhe at github.com/tensorflow/tensorflow/pull/5370. We needed to do this change internally to fix all callers.

Motivation: The existing FileExists interface doesn't allow callers to distinguish between file not found vs. filesystem errors.

Semantics changes:
- gfile.Exists in Python now throws an exception for filesystem errors. It continues to return true/false if it can accurately determine whether a file exists.
- RecursivelyCreateDir now returns errors for filesystem errors when calling FileExists.
Change: 138224013

1 files changed, 11 insertions, 11 deletions

diff --git a/tensorflow/core/util/events_writer_test.cc b/tensorflow/core/util/events_writer_test.cc
index 943dd46104..a96be61985 100644
--- a/tensorflow/core/util/events_writer_test.cc
+++ b/tensorflow/core/util/events_writer_test.cc
@@ -61,7 +61,7 @@ static bool ReadEventProto(io::RecordReader* reader, uint64* offset,
 }
 
 void VerifyFile(const string& filename) {
-  CHECK(env()->FileExists(filename));
+  CHECK(env()->FileExists(filename).ok());
   std::unique_ptr<RandomAccessFile> event_file;
   TF_CHECK_OK(env()->NewRandomAccessFile(filename, &event_file));
   io::RecordReader* reader = new io::RecordReader(event_file.get());
@@ -139,11 +139,11 @@ TEST(EventWriter, FailFlush) {
   EventsWriter writer(file_prefix);
   string filename = writer.FileName();
   WriteFile(&writer);
-  EXPECT_TRUE(env()->FileExists(filename));
+  TF_EXPECT_OK(env()->FileExists(filename));
   env()->DeleteFile(filename);
-  EXPECT_FALSE(env()->FileExists(filename));
+  EXPECT_EQ(errors::Code::NOT_FOUND, env()->FileExists(filename).code());
   EXPECT_FALSE(writer.Flush());
-  EXPECT_FALSE(env()->FileExists(filename));
+  EXPECT_EQ(errors::Code::NOT_FOUND, env()->FileExists(filename).code());
 }
 
 TEST(EventWriter, FailClose) {
@@ -151,11 +151,11 @@ TEST(EventWriter, FailClose) {
   EventsWriter writer(file_prefix);
   string filename = writer.FileName();
   WriteFile(&writer);
-  EXPECT_TRUE(env()->FileExists(filename));
+  TF_EXPECT_OK(env()->FileExists(filename));
   env()->DeleteFile(filename);
-  EXPECT_FALSE(env()->FileExists(filename));
+  EXPECT_EQ(errors::Code::NOT_FOUND, env()->FileExists(filename).code());
   EXPECT_FALSE(writer.Close());
-  EXPECT_FALSE(env()->FileExists(filename));
+  EXPECT_EQ(errors::Code::NOT_FOUND, env()->FileExists(filename).code());
 }
 
 TEST(EventWriter, InitWriteClose) {
@@ -163,7 +163,7 @@ TEST(EventWriter, InitWriteClose) {
   EventsWriter writer(file_prefix);
   EXPECT_TRUE(writer.Init());
   string filename0 = writer.FileName();
-  EXPECT_TRUE(env()->FileExists(filename0));
+  TF_EXPECT_OK(env()->FileExists(filename0));
   WriteFile(&writer);
   EXPECT_TRUE(writer.Close());
   string filename1 = writer.FileName();
@@ -175,7 +175,7 @@ TEST(EventWriter, NameWriteClose) {
   string file_prefix = GetDirName("/namewriteclose_test");
   EventsWriter writer(file_prefix);
   string filename = writer.FileName();
-  EXPECT_TRUE(env()->FileExists(filename));
+  TF_EXPECT_OK(env()->FileExists(filename));
   WriteFile(&writer);
   EXPECT_TRUE(writer.Close());
   VerifyFile(filename);
@@ -186,7 +186,7 @@ TEST(EventWriter, NameClose) {
   EventsWriter writer(file_prefix);
   string filename = writer.FileName();
   EXPECT_TRUE(writer.Close());
-  EXPECT_TRUE(env()->FileExists(filename));
+  TF_EXPECT_OK(env()->FileExists(filename));
   env()->DeleteFile(filename);
 }
 
@@ -194,7 +194,7 @@ TEST(EventWriter, FileDeletionBeforeWriting) {
   string file_prefix = GetDirName("/fdbw_test");
   EventsWriter writer(file_prefix);
   string filename0 = writer.FileName();
-  EXPECT_TRUE(env()->FileExists(filename0));
+  TF_EXPECT_OK(env()->FileExists(filename0));
   env()->SleepForMicroseconds(
       2000000);  // To make sure timestamp part of filename will differ.
   env()->DeleteFile(filename0);