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

Unified Diff: sandbox/linux/services/proc_util_unittest.cc

Issue 939723003: sandbox: Change directory names in ProcUtil test to support Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/services/proc_util_unittest.cc
diff --git a/sandbox/linux/services/proc_util_unittest.cc b/sandbox/linux/services/proc_util_unittest.cc
index ee36c8343d77c56c37394a7fcd3a17a19fdb3338..54747d8c6995f8292bceec7579642bee93741787 100644
--- a/sandbox/linux/services/proc_util_unittest.cc
+++ b/sandbox/linux/services/proc_util_unittest.cc
@@ -28,9 +28,9 @@ TEST(ProcUtil, HasOpenDirectory) {
// No open directory should exist at startup.
EXPECT_FALSE(ProcUtil::HasOpenDirectory(-1));
{
- // Have a "/dev" file descriptor around.
- int dev_fd = open("/dev", O_RDONLY | O_DIRECTORY);
- base::ScopedFD dev_fd_closer(dev_fd);
+ // Have a "/proc" file descriptor around.
+ int proc_fd = open("/proc", O_RDONLY | O_DIRECTORY);
+ base::ScopedFD proc_fd_closer(proc_fd);
EXPECT_TRUE(ProcUtil::HasOpenDirectory(-1));
}
EXPECT_FALSE(ProcUtil::HasOpenDirectory(-1));
@@ -48,14 +48,14 @@ TEST(ProcUtil, HasOpenDirectoryWithFD) {
EXPECT_FALSE(ProcUtil::HasOpenDirectory(proc_fd));
{
- // Have a "/dev" file descriptor around.
- int dev_fd = open("/dev", O_RDONLY | O_DIRECTORY);
- base::ScopedFD dev_fd_closer(dev_fd);
+ // Have a "/proc/self" file descriptor around.
jln (very slow on Chromium) 2015/02/19 00:47:21 It's a little confusing to use /proc/self/ given t
leecam 2015/02/20 00:27:43 Yeah at the moment but nnk is working to lock down
jln (very slow on Chromium) 2015/02/20 01:14:14 Maybe rename the variable from "proc_self_fd" to "
+ int proc_self_fd = open("/proc/self", O_RDONLY | O_DIRECTORY);
+ base::ScopedFD proc_self_fd_closer(proc_self_fd);
EXPECT_TRUE(ProcUtil::HasOpenDirectory(proc_fd));
}
- // The "/dev" file descriptor should now be closed, |proc_fd| is the only
- // directory file descriptor open.
+ // The "/proc/self" file descriptor should now be closed, |proc_fd| is the
+ // only directory file descriptor open.
EXPECT_FALSE(ProcUtil::HasOpenDirectory(proc_fd));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698