test: enable unit tests to suspend logging

diff --git a/test/unit/test.c b/test/unit/test.c
index 67f7678c761bb15ddbbf5be728764c697593f4d3..3a9ec747d6f8c9117f37937377571a8c167fa2e4 100644 (file)
--- a/test/unit/test.c
+++ b/test/unit/test.c
@@ -75,6 +75,16 @@ main(int argc, char **argv)
   return 0;
 }
 
+void TST_SuspendLogging(void)
+{
+  LOG_OpenFileLog("/dev/null");
+}
+
+void TST_ResumeLogging(void)
+{
+  LOG_OpenFileLog(NULL);
+}
+
 double
 TST_GetRandomDouble(double min, double max)
 {

diff --git a/test/unit/test.h b/test/unit/test.h
index d96f3afb18d68d4b8ad275a9eda57a22aa4650c0..f4092524fcde63a8dfbbb693930648d89da813e5 100644 (file)
--- a/test/unit/test.h
+++ b/test/unit/test.h
@@ -35,6 +35,9 @@ extern void test_unit(void);
 
 extern void TST_Fail(int line);
 
+extern void TST_SuspendLogging(void);
+extern void TST_ResumeLogging(void);
+
 extern double TST_GetRandomDouble(double min, double max);
 extern void TST_GetRandomAddress(IPAddr *ip, int family, int bits);
 extern void TST_SwapAddressBit(IPAddr *ip, unsigned int b);

diff --git a/test/unit/util.c b/test/unit/util.c
index d698bc2a14beaf2be80835e4634430b3a4466618..6ce6f90d795bc49d757a2c8bc0ec722e998a3002 100644 (file)
--- a/test/unit/util.c
+++ b/test/unit/util.c
@@ -251,18 +251,17 @@ void test_unit(void) {
 
   TEST_CHECK(SQUARE(3.0) == 3.0 * 3.0);
 
-  /* Suppress log messages */
-  unlink("test.log");
-  LOG_OpenFileLog("test.log");
-
   rmdir("testdir");
 
   uid = geteuid();
   gid = getegid();
 
   TEST_CHECK(UTI_CreateDirAndParents("testdir", 0700, uid, gid));
+
+  TST_SuspendLogging();
   TEST_CHECK(UTI_CheckDirPermissions("testdir", 0700, uid, gid));
   TEST_CHECK(!UTI_CheckDirPermissions("testdir", 0300, uid, gid));
   TEST_CHECK(!UTI_CheckDirPermissions("testdir", 0700, uid + 1, gid));
   TEST_CHECK(!UTI_CheckDirPermissions("testdir", 0700, uid, gid + 1));
+  TST_ResumeLogging();
 }