AU: Delta Diff Generator

src/platform/update_engine/filesystem_iterator_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 <set>
 #include <string>
 #include <vector>
@@ skipping 39 matching lines @@
                       kMountPath));
   ASSERT_EQ(0, System(string("mount -o loop ") + sub_image + " " +
                       kMountPath + "/some_dir/mnt"));
   for (vector<string>::iterator it = expected_paths_vector.begin();
        it != expected_paths_vector.end(); ++it)
     *it = kMountPath + *it;
   set<string> expected_paths(expected_paths_vector.begin(),
                              expected_paths_vector.end());
   VerifyAllPaths(kMountPath, expected_paths);
   
-  EXPECT_EQ(0, System(string("umount ") + kMountPath + "/some_dir/mnt"));
-  EXPECT_EQ(0, System(string("umount ") + kMountPath));
+  EXPECT_EQ(0, System(string("umount -d ") + kMountPath + "/some_dir/mnt"));
+  EXPECT_EQ(0, System(string("umount -d ") + kMountPath));
   EXPECT_EQ(0, System(string("rm -f ") + first_image + " " + sub_image));
 }
 
 TEST_F(FilesystemIteratorTest, NegativeTest) {
   {
     FilesystemIterator iter("/non/existent/path", set<string>());
     EXPECT_TRUE(iter.IsEnd());
     EXPECT_TRUE(iter.IsErr());
   }
 
@@ skipping 39 matching lines @@
       EXPECT_EQ(0, rmdir("DeleteWhileTraverseTest/a"));
     }
     iter.Increment();
   }
   EXPECT_FALSE(iter.IsErr());
   EXPECT_TRUE(expected_paths.empty());
   EXPECT_EQ(0, system("rm -rf DeleteWhileTraverseTest"));
 }
 
 }  // namespace chromeos_update_engine