AU: Delta Diff Generator

src/platform/update_engine/filesystem_copier_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 <glib.h>
 #include <set>
 #include <string>
 #include <vector>
 #include <gtest/gtest.h>
 #include "update_engine/filesystem_copier_action.h"
@@ skipping 119 matching lines @@
   processor.EnqueueAction(&collector_action);
 
   copier_action.set_copy_source(TestDir() + "/mnt");
   feeder_action.set_obj(install_plan);
 
   g_timeout_add(0, &StartProcessorInRunLoop, &processor);
   g_main_loop_run(loop);
   g_main_loop_unref(loop);
 
   EXPECT_EQ(0, System(string("losetup -d ") + dev));
-  EXPECT_EQ(0, System(string("umount ") + TestDir() + "/mnt/some_dir/mnt"));
-  EXPECT_EQ(0, System(string("umount ") + TestDir() + "/mnt"));
+  EXPECT_EQ(0, System(string("umount -d ") + TestDir() + "/mnt/some_dir/mnt"));
+  EXPECT_EQ(0, System(string("umount -d ") + TestDir() + "/mnt"));
   EXPECT_EQ(0, unlink(a_image.c_str()));
   EXPECT_EQ(0, unlink(b_image.c_str()));
 
   EXPECT_TRUE(delegate.ran());
   if (run_out_of_space) {
     EXPECT_FALSE(delegate.success());
     EXPECT_EQ(0, unlink(out_image.c_str()));
     EXPECT_EQ(0, rmdir((TestDir() + "/mnt").c_str()));
     return;
   }
   EXPECT_TRUE(delegate.success());
 
   EXPECT_EQ(0, System(string("mount -o loop ") + out_image + " " +
                       TestDir() + "/mnt"));
   // Make sure everything in the out_image is there
   expected_paths_vector.push_back("/update_engine_copy_success");
   for (vector<string>::iterator it = expected_paths_vector.begin();
        it != expected_paths_vector.end(); ++it) {
     *it = TestDir() + "/mnt" + *it;
   }
   set<string> expected_paths(expected_paths_vector.begin(),
                              expected_paths_vector.end());
   VerifyAllPaths(TestDir() + "/mnt", expected_paths);
   string file_data;
   EXPECT_TRUE(utils::ReadFileToString(TestDir() + "/mnt/hi", &file_data));
   EXPECT_EQ("hi\n", file_data);
   EXPECT_TRUE(utils::ReadFileToString(TestDir() + "/mnt/hello", &file_data));
   EXPECT_EQ("hello\n", file_data);
   EXPECT_EQ("/some/target", Readlink(TestDir() + "/mnt/sym"));
-  EXPECT_EQ(0, System(string("umount ") + TestDir() + "/mnt"));
+  EXPECT_EQ(0, System(string("umount -d ") + TestDir() + "/mnt"));
 
   EXPECT_EQ(0, unlink(out_image.c_str()));
   EXPECT_EQ(0, rmdir((TestDir() + "/mnt").c_str()));
 
   EXPECT_FALSE(copier_action.skipped_copy());
   LOG(INFO) << "collected plan:";
   collector_action.object().Dump();
   LOG(INFO) << "expected plan:";
   install_plan.Dump();
   EXPECT_TRUE(collector_action.object() == install_plan);
@@ skipping 84 matching lines @@
   ASSERT_EQ(0, getuid());
   DoTest(true, false);
 }
 
 TEST_F(FilesystemCopierActionTest, RunAsRootNoSpaceTest) {
   ASSERT_EQ(0, getuid());
   DoTest(false, true);
 }
 
 }  // namespace chromeos_update_engine