From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 28 Aug 2018 12:20:40 +0000 (+0200)
Subject: test: enable unit tests to suspend logging
X-Git-Tag: 3.4-pre1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e034a07be8b30567afecfd2161a7fad5d5f947ad;p=thirdparty%2Fchrony.git

test: enable unit tests to suspend logging
---

diff --git a/test/unit/test.c b/test/unit/test.c
index 67f7678c..3a9ec747 100644
--- 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 d96f3afb..f4092524 100644
--- 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 d698bc2a..6ce6f90d 100644
--- 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();
 }