AU: Delta Diff Generator

src/platform/update_engine/postinstall_runner_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 <unistd.h>
 #include <string>
 #include <vector>
 #include <gtest/gtest.h>
@@ skipping 69 matching lines @@
   ASSERT_EQ(0, System(string("mount -o loop image.dat ") + mountpoint));
 
   // put a postinst script in
   string script = string("#!/bin/bash\ntouch ") + cwd + "/postinst_called\n";
   if (do_err_script) {
     script = "#!/bin/bash\nexit 1";
   }
   ASSERT_TRUE(WriteFileString(mountpoint + "/postinst", script));
   ASSERT_EQ(0, System(string("chmod a+x ") + mountpoint + "/postinst"));
 
-  ASSERT_EQ(0, System(string("umount ") + mountpoint));
+  ASSERT_EQ(0, System(string("umount -d ") + mountpoint));
 
   ASSERT_EQ(0, System(string("rm -f ") + cwd + "/postinst_called"));
 
   // get a loop device we can use for the install device
   FILE* find_dev_cmd = popen("losetup -f", "r");
   ASSERT_TRUE(find_dev_cmd);
 
   char dev[100] = {0};
   size_t r = fread(dev, 1, sizeof(dev), find_dev_cmd);
   ASSERT_GT(r, 0);
@@ skipping 46 matching lines @@
 
 // Death tests don't seem to be working on Hardy
 TEST_F(PostinstallRunnerActionTest, DISABLED_RunAsRootDeathTest) {
   ASSERT_EQ(0, getuid());
   PostinstallRunnerAction runner_action;
   ASSERT_DEATH({ runner_action.TerminateProcessing(); },
                "postinstall_runner_action.h:.*] Check failed");
 }
 
 }  // namespace chromeos_update_engine