diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-09-24 00:19:39 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-09-24 00:19:39 +0400 |
| commit | 7fd35e6ea43ece7ef40d50820a80d798eceaa362 (patch) | |
| tree | 3a809b23142c7f0d6682d0af5ad614a7624df70c /deps/uv/test/test-fs.c | |
| parent | c5f5d4cd11c2aec74fa03985405122d1ecb06f69 (diff) | |
| download | android-node-v8-7fd35e6ea43ece7ef40d50820a80d798eceaa362.tar.gz android-node-v8-7fd35e6ea43ece7ef40d50820a80d798eceaa362.tar.bz2 android-node-v8-7fd35e6ea43ece7ef40d50820a80d798eceaa362.zip | |
uv: apply floating patch 2f54947b
Diffstat (limited to 'deps/uv/test/test-fs.c')
| -rw-r--r-- | deps/uv/test/test-fs.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/deps/uv/test/test-fs.c b/deps/uv/test/test-fs.c index a06ddada8e..a514801b9b 100644 --- a/deps/uv/test/test-fs.c +++ b/deps/uv/test/test-fs.c @@ -436,10 +436,13 @@ static void readdir_cb(uv_fs_t* req) { static void empty_readdir_cb(uv_fs_t* req) { + uv_dirent_t dent; + ASSERT(req == &readdir_req); ASSERT(req->fs_type == UV_FS_READDIR); ASSERT(req->result == 0); ASSERT(req->ptr == NULL); + ASSERT(UV_EOF == uv_fs_readdir_next(req, &dent)); uv_fs_req_cleanup(req); readdir_cb_count++; } @@ -1805,6 +1808,7 @@ TEST_IMPL(fs_stat_missing_path) { TEST_IMPL(fs_readdir_empty_dir) { const char* path; uv_fs_t req; + uv_dirent_t dent; int r; path = "./empty_dir/"; @@ -1813,10 +1817,14 @@ TEST_IMPL(fs_readdir_empty_dir) { uv_fs_mkdir(loop, &req, path, 0777, NULL); uv_fs_req_cleanup(&req); + /* Fill the req to ensure that required fields are cleaned up */ + memset(&req, 0xdb, sizeof(req)); + r = uv_fs_readdir(loop, &req, path, 0, NULL); ASSERT(r == 0); ASSERT(req.result == 0); ASSERT(req.ptr == NULL); + ASSERT(UV_EOF == uv_fs_readdir_next(&req, &dent)); uv_fs_req_cleanup(&req); r = uv_fs_readdir(loop, &readdir_req, path, 0, empty_readdir_cb); |