AU: Try delta updates first, then full updates

src/platform/update_engine/install_action_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <utime.h>
 #include <set>
 #include <string>
@@ skipping 108 matching lines @@
   {
     // Fill bigfile w/ some data in the new folder
     vector<char> buf(100 * 1024);
     for (unsigned int i = 0; i < buf.size(); i++) {
       buf[i] = static_cast<char>(i);
     }
     EXPECT_TRUE(WriteFileVector(new_dir + "/dir/bigfile", buf));
   }
   const char* const new_dir_cstr = new_dir.c_str();
   EXPECT_EQ(0, System(StringPrintf("mkdir -p '%s/newdir'", new_dir_cstr)));
+  EXPECT_EQ(0, System(StringPrintf("chmod 03755 '%s/newdir'", new_dir_cstr)));
   EXPECT_EQ(0, System(StringPrintf("mkdir -p '%s/newdir/x'", new_dir_cstr)));
   EXPECT_EQ(0, System(StringPrintf("echo -n foo > '%s/newdir/x/file'",
                                    new_dir_cstr)));
+  EXPECT_EQ(0, System(StringPrintf("touch '%s/new_empty'", new_dir_cstr)));
+  EXPECT_EQ(0, System(StringPrintf("chmod 04644 '%s/new_empty'",
+                                   new_dir_cstr)));
   EXPECT_EQ(0, System(StringPrintf("echo -n x >> '%s/big_file'",
                                    new_dir_cstr)));
+  EXPECT_EQ(0, System(StringPrintf("chmod 02644 '%s/big_file'", new_dir_cstr)));
   // Make a symlink that compresses well:
   EXPECT_EQ(0, System(StringPrintf(
       "ln -s "
       "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
       "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
       "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
       "'%s/compress_sym'", new_dir_cstr)));
 
   // Make a device that will compress
   EXPECT_EQ(0, mknod((new_dir + "/bdev_gz").c_str(), S_IFCHR | 0644, 0));
 
   // Make a diff
   DeltaArchiveManifest* delta =
       DeltaDiffGenerator::EncodeMetadataToProtoBuffer(new_dir.c_str());
   EXPECT_TRUE(NULL != delta);
   EXPECT_TRUE(DeltaDiffGenerator::EncodeDataToDeltaFile(delta,
                                                         original_dir,
                                                         new_dir,
                                                         "delta",
+                                                        set<string>(),
                                                         new_dir + "/bdev_gz"));
 
   ASSERT_EQ(0, System(string("umount ") + original_dir));
 
   ObjectFeederAction<InstallPlan> feeder_action;
   InstallAction install_action;
   ObjectCollectorAction<string> collector_action;
 
   BondActions(&feeder_action, &install_action);
   BondActions(&install_action, &collector_action);
@@ skipping 34 matching lines @@
     for (; !iter.IsEnd(); iter.Increment()) {
       new_count++;
       LOG(INFO) << "checking path: " << iter.GetPartialPath();
       EXPECT_TRUE(FilesEqual(original_dir + iter.GetPartialPath(),
                              new_dir + iter.GetPartialPath()));
     }
     EXPECT_FALSE(iter.IsErr());
   }
   LOG(INFO) << "new_count = " << new_count;
   EXPECT_EQ(new_count, original_count);
-  EXPECT_EQ(19, original_count);
+  EXPECT_EQ(20, original_count);
 
   // Make sure hard-link installed properly
   {
     struct stat hard_link_stbuf;
     struct stat hi_stbuf;
     EXPECT_EQ(0, lstat((string(new_dir) + "/hard_link").c_str(),
                        &hard_link_stbuf));
     EXPECT_EQ(0, lstat((string(new_dir) + "/hi").c_str(), &hi_stbuf));
     EXPECT_EQ(hard_link_stbuf.st_mode, hi_stbuf.st_mode);
     EXPECT_EQ(2, hard_link_stbuf.st_nlink);
@@ skipping 46 matching lines @@
 
   InstallPlan install_plan(false, "", "", "no_such_file", "install_path");
   feeder_action.set_obj(install_plan);
 
   processor.StartProcessing();
   EXPECT_FALSE(processor.IsRunning()) << "Update to handle async actions";
   EXPECT_TRUE(collector_action.object().empty());
 }
 
 }  // namespace chromeos_update_engine