Merge test actually finding problems now.

1 files changed, 8 insertions, 3 deletions

diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index d3b9d4a..a0231be 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -137,7 +137,6 @@ public:
 
   void WriteTmpFile(TmpFile *f) const;
 
-private:
   void SetSize(size_t size) {
     size_ = size;
 
@@ -149,7 +148,7 @@ private:
       data_size_ = size;
     }
   }
-
+private:
   friend class BlockIterator;
 
   mutable uint8_t *data_;
@@ -226,8 +225,8 @@ public:
     char buf[32];
     snprintf(buf, 32, "/tmp/regtest.%d", static_counter++);
     filename_.append(buf);
+    unlink(filename_.c_str());
     main_file_init(&file_);
-    CHECK_EQ(0, main_file_open(&file_, filename_.c_str(), XO_WRITE));
   }
 
   ~TmpFile() {
@@ -236,6 +235,9 @@ public:
   }
 
   void Append(const Block *block) {
+    if (!main_file_isopen(&file_)) {
+      CHECK_EQ(0, main_file_open(&file_, filename_.c_str(), XO_WRITE));
+    }
     CHECK_EQ(0, main_file_write(&file_, 
                                 block->Data(), block->Size(), 
                                 "tmpfile write failed"));
@@ -246,6 +248,9 @@ public:
     return filename_.c_str();
   }
 
+  // Check whether a real file matches a file spec.
+  bool EqualsSpec(const FileSpec &spec) const;
+
 private:
   string filename_;
   mutable main_file file_;