daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1abbee
From a714212703b3fe5f2a27773602cabbc4ab53da15 Mon Sep 17 00:00:00 2001
4e2e74
From: Martin Pitt <martin.pitt@ubuntu.com>
4e2e74
Date: Mon, 15 Jun 2015 08:59:44 +0200
4e2e74
Subject: [PATCH] sysv-generator test: always log to console
4e2e74
4e2e74
Set $SYSTEMD_LOG_TARGET so that the output always goes to stdout/stderr. This
4e2e74
fixes running the test as root, as that logged to the journal previously.
4e2e74
4e2e74
https://github.com/systemd/systemd/issues/195
4e2e74
4e2e74
Cherry-picked from: 6b7d32add4733a83f86e18bb86f914037a6688b7
1abbee
Resolves: #1279034
4e2e74
---
4e2e74
 test/sysv-generator-test.py | 1 +
4e2e74
 1 file changed, 1 insertion(+)
4e2e74
4e2e74
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
181b3f
index e716d705c..153786417 100644
4e2e74
--- a/test/sysv-generator-test.py
4e2e74
+++ b/test/sysv-generator-test.py
4e2e74
@@ -60,6 +60,7 @@ class SysvGeneratorTest(unittest.TestCase):
4e2e74
         '''
4e2e74
         env = os.environ.copy()
4e2e74
         env['SYSTEMD_LOG_LEVEL'] = 'debug'
4e2e74
+        env['SYSTEMD_LOG_TARGET'] = 'console'
4e2e74
         env['SYSTEMD_SYSVINIT_PATH'] = self.init_d_dir
4e2e74
         env['SYSTEMD_SYSVRCND_PATH'] = self.rcnd_dir
4e2e74
         env['SYSTEMD_UNIT_PATH'] = self.unit_dir