|
 |
425458 |
From 0a7b51d1eb6f948724c08e94148e8ff1f448d100 Mon Sep 17 00:00:00 2001
|
|
|
425458 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
425458 |
Date: Fri, 13 Jul 2018 14:10:28 +0200
|
|
|
425458 |
Subject: [PATCH] test: unit-test.py: daemon will not stay in foreground with
|
|
|
425458 |
-D anymore
|
|
|
425458 |
MIME-Version: 1.0
|
|
|
425458 |
Content-Type: text/plain; charset=UTF-8
|
|
|
425458 |
Content-Transfer-Encoding: 8bit
|
|
|
425458 |
|
|
|
425458 |
Commit a66ac33 missed this impact (it may have missed impact on
|
|
|
425458 |
test/boothrunner.py but it appears to be fine either way).
|
|
|
425458 |
|
|
|
425458 |
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
|
|
|
425458 |
---
|
|
|
425458 |
script/unit-test.py.in | 3 +--
|
|
|
425458 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
425458 |
|
|
|
425458 |
diff --git a/script/unit-test.py.in b/script/unit-test.py.in
|
|
|
425458 |
index fc98bc1..74a014b 100644
|
|
|
425458 |
--- a/script/unit-test.py.in
|
|
|
425458 |
+++ b/script/unit-test.py.in
|
|
|
425458 |
@@ -2,7 +2,6 @@
|
|
|
425458 |
# vim: fileencoding=utf-8
|
|
|
425458 |
# see http://stackoverflow.com/questions/728891/correct-way-to-define-python-source-code-encoding
|
|
|
425458 |
# NOTE: setting the encoding is needed as non-ASCII characters are contained
|
|
|
425458 |
-# FIXME: apparently, pexpect.EOF is not being excepted properly
|
|
|
425458 |
|
|
|
425458 |
import os, sys, time, signal, tempfile, socket, posix, time
|
|
|
425458 |
import re, shutil, pexpect, logging, pprint
|
|
|
425458 |
@@ -220,7 +219,7 @@ class UT():
|
|
|
425458 |
|
|
|
425458 |
def start_processes(self, test):
|
|
|
425458 |
self.booth = self.start_a_process(self.binary,
|
|
|
425458 |
- args = ["daemon", "-D",
|
|
|
425458 |
+ args = ["daemon", "-DS",
|
|
|
425458 |
"-c", self.test_base + "/booth.conf",
|
|
|
425458 |
"-s", "127.0.0.1",
|
|
|
425458 |
"-l", self.lockfile],
|
|
|
425458 |
--
|
|
|
425458 |
2.18.0.rc2
|
|
|
425458 |
|