b4585aa546
...per https://github.com/ClusterLabs/booth/pull/22#issuecomment-216936987 - pre-inclusion cleanups in the spec (apply systemd scriptlet operations with booth-arbitrator, avoid overloading file implicitly considered %%doc as %%license) Resolves: rhbz#1314865 Related: rhbz#1333509 Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 14c17a4c675a616b089400c935f74c27d15f5ee3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
Date: Wed, 27 Apr 2016 19:39:21 +0200
|
|
Subject: [PATCH] test: adapt to libqb-based logging with lowercased priorities
|
|
|
|
---
|
|
test/assertions.py | 2 +-
|
|
test/servertests.py | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/test/assertions.py b/test/assertions.py
|
|
index ea242b7..4396ab7 100755
|
|
--- a/test/assertions.py
|
|
+++ b/test/assertions.py
|
|
@@ -8,7 +8,7 @@ def configFileMissingMyIP(self, config_file=None, lock_file=None):
|
|
self.run_booth(config_file=config_file, lock_file=lock_file,
|
|
expected_exitcode=1, expected_daemon=False)
|
|
|
|
- expected_error = "ERROR: Cannot find myself in the configuration"
|
|
+ expected_error = "(ERROR|error): Cannot find myself in the configuration"
|
|
self.assertRegexpMatches(stderr, expected_error)
|
|
|
|
def assertLockFileError(self, config_file=None, config_text=None,
|
|
diff --git a/test/servertests.py b/test/servertests.py
|
|
index 3742ed6..290bce2 100755
|
|
--- a/test/servertests.py
|
|
+++ b/test/servertests.py
|
|
@@ -79,7 +79,7 @@ def test_missing_quotes(self):
|
|
if line_contains_IP:
|
|
self.assertRegexpMatches(
|
|
self.read_log(),
|
|
- "ERROR: invalid config file format: unquoted '.'",
|
|
+ "(ERROR|error): invalid config file format: unquoted '.'",
|
|
'IP addresses need to be quoted'
|
|
)
|
|
|
|
--
|
|
2.4.11
|
|
|