Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Unified Diff: src/platform/update_engine/filesystem_copier_action_unittest.cc

Issue 891002: AU: Delta Diff Generator (Closed)
Patch Set: fixes for review Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/platform/update_engine/filesystem_copier_action_unittest.cc
diff --git a/src/platform/update_engine/filesystem_copier_action_unittest.cc b/src/platform/update_engine/filesystem_copier_action_unittest.cc
index 1e024f1898781fcfb1c69c99c69f13a57c2078cb..86c15ac48682acf94ab634145745a788c5c6052b 100644
--- a/src/platform/update_engine/filesystem_copier_action_unittest.cc
+++ b/src/platform/update_engine/filesystem_copier_action_unittest.cc
@@ -137,8 +137,8 @@ void FilesystemCopierActionTest::DoTest(bool double_copy,
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()));
@@ -168,7 +168,7 @@ void FilesystemCopierActionTest::DoTest(bool double_copy,
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()));
« no previous file with comments | « src/platform/update_engine/extent_writer.cc ('k') | src/platform/update_engine/filesystem_iterator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698