[tor-commits] [tor/master] Check more return values in the unit tests

[nickm at torproject.org]

commit 8a96a85d66328ba0088b9d9999771ff863cc0e60
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 18 12:31:03 2013 -0400

    Check more return values in the unit tests
---
 src/test/test_config.c |   12 ++++++------
 src/test/test_dir.c    |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index ad30cdf..4e9e13e 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -202,9 +202,9 @@ test_config_check_or_create_data_subdir(void *arg)
   (void)arg;
 
 #if defined (_WIN32) && !defined (WINCE)
-  mkdir(options->DataDirectory);
+  tt_int_op(mkdir(options->DataDirectory), ==, 0);
 #else
-  mkdir(options->DataDirectory, 0700);
+  tt_int_op(mkdir(options->DataDirectory, 0700), ==, 0);
 #endif
 
   r = stat(subpath, &st);
@@ -266,14 +266,14 @@ test_config_write_to_data_subdir(void *arg)
   (void)arg;
 
 #if defined (_WIN32) && !defined (WINCE)
-  mkdir(options->DataDirectory);
+  tt_int_op(mkdir(options->DataDirectory), ==, 0);
 #else
-  mkdir(options->DataDirectory, 0700);
+  tt_int_op(mkdir(options->DataDirectory, 0700), ==, 0);
 #endif
 
   // Write attempt shoudl fail, if subdirectory doesn't exist.
   test_assert(write_to_data_subdir(subdir, fname, str, NULL));
-  check_or_create_data_subdir(subdir);
+  test_assert(! check_or_create_data_subdir(subdir));
 
   // Content of file after write attempt should be
   // equal to the original string.
@@ -285,7 +285,7 @@ test_config_write_to_data_subdir(void *arg)
   test_streq(read_file_to_str(filepath, 0, NULL), str);
 
  done:
-  remove(filepath);
+  (void) unlink(filepath);
   rmdir(options->DataDirectory);
   tor_free(datadir);
   tor_free(filepath);
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 56ac3b3..6c2915d 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -2317,9 +2317,9 @@ test_dir_v2_dir(void *arg)
 
   /* Make a directory so there's somewhere to store the thing */
 #ifdef _WIN32
-  mkdir(get_fname("cached-status"));
+  tt_int_op(mkdir(get_fname("cached-status")), ==, 0);
 #else
-  mkdir(get_fname("cached-status"), 0700);
+  tt_int_op(mkdir(get_fname("cached-status"), 0700), ==, 0);
 #endif
 
   v2 = generate_v2_networkstatus_opinion();