diff options
| author | Josh Gao <jmgao@google.com> | 2019-01-23 15:36:42 -0800 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2019-01-23 17:11:13 -0800 |
| commit | 74ccdf984b25a50faeda2b8dee380c2d193e3046 (patch) | |
| tree | 2f2c2c3b2f41bbe7a531a4810fa5bf9a05e1a77a /adb/adb_utils_test.cpp | |
| parent | 776c2ec08c7b9736a4c7a635daa8687aa19f8f70 (diff) | |
adb: convert more stuff to unique_fd.
Test: adb_test
Test: adbd_test
Test: test_device.py
Change-Id: Ie75f0b811d2c75d508e6ecffb40579308f5789d0
Diffstat (limited to 'adb/adb_utils_test.cpp')
| -rw-r--r-- | adb/adb_utils_test.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/adb/adb_utils_test.cpp b/adb/adb_utils_test.cpp index bb094258c5..8518e17825 100644 --- a/adb/adb_utils_test.cpp +++ b/adb/adb_utils_test.cpp @@ -147,17 +147,16 @@ TEST(adb_utils, mkdirs) { #if !defined(_WIN32) TEST(adb_utils, set_file_block_mode) { - int fd = adb_open("/dev/null", O_RDWR | O_APPEND); - ASSERT_GE(fd, 0); - int flags = fcntl(fd, F_GETFL, 0); - ASSERT_EQ(O_RDWR | O_APPEND, (flags & (O_RDWR | O_APPEND))); - ASSERT_TRUE(set_file_block_mode(fd, false)); - int new_flags = fcntl(fd, F_GETFL, 0); - ASSERT_EQ(flags | O_NONBLOCK, new_flags); - ASSERT_TRUE(set_file_block_mode(fd, true)); - new_flags = fcntl(fd, F_GETFL, 0); - ASSERT_EQ(flags, new_flags); - ASSERT_EQ(0, adb_close(fd)); + unique_fd fd(adb_open("/dev/null", O_RDWR | O_APPEND)); + ASSERT_GE(fd, 0); + int flags = fcntl(fd, F_GETFL, 0); + ASSERT_EQ(O_RDWR | O_APPEND, (flags & (O_RDWR | O_APPEND))); + ASSERT_TRUE(set_file_block_mode(fd, false)); + int new_flags = fcntl(fd, F_GETFL, 0); + ASSERT_EQ(flags | O_NONBLOCK, new_flags); + ASSERT_TRUE(set_file_block_mode(fd, true)); + new_flags = fcntl(fd, F_GETFL, 0); + ASSERT_EQ(flags, new_flags); } #endif |