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