|
 |
afe0d5 |
From a642a833e31a6bd1e71dc2045a16e494775b35e6 Mon Sep 17 00:00:00 2001
|
|
|
afe0d5 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
afe0d5 |
Date: Thu, 12 Jul 2018 18:58:32 +0200
|
|
|
afe0d5 |
Subject: [PATCH] test: do not mix tabs with spaces in Python code
|
|
|
afe0d5 |
MIME-Version: 1.0
|
|
|
afe0d5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
afe0d5 |
Content-Transfer-Encoding: 8bit
|
|
|
afe0d5 |
|
|
|
afe0d5 |
Beside being matter of a good style, it's also forbidden inside
|
|
|
afe0d5 |
a single, non-delimited block in Python 3.
|
|
|
afe0d5 |
|
|
|
afe0d5 |
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
|
|
|
afe0d5 |
---
|
|
|
afe0d5 |
test/servertests.py | 16 ++++++++--------
|
|
|
afe0d5 |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
afe0d5 |
|
|
|
afe0d5 |
diff --git a/test/servertests.py b/test/servertests.py
|
|
|
afe0d5 |
index 39a6ffc..71e808e 100644
|
|
|
afe0d5 |
--- a/test/servertests.py
|
|
|
afe0d5 |
+++ b/test/servertests.py
|
|
|
afe0d5 |
@@ -51,8 +51,8 @@ class ServerTests(ServerTestEnvironment):
|
|
|
afe0d5 |
config_text=self.working_config)
|
|
|
afe0d5 |
|
|
|
afe0d5 |
def test_missing_quotes(self):
|
|
|
afe0d5 |
- # quotes no longer required
|
|
|
afe0d5 |
- return True
|
|
|
afe0d5 |
+ # quotes no longer required
|
|
|
afe0d5 |
+ return True
|
|
|
afe0d5 |
orig_lines = self.working_config.split("\n")
|
|
|
afe0d5 |
for i in xrange(len(orig_lines)):
|
|
|
afe0d5 |
new_lines = copy.copy(orig_lines)
|
|
|
afe0d5 |
@@ -97,8 +97,8 @@ class ServerTests(ServerTestEnvironment):
|
|
|
afe0d5 |
expected_exitcode=None, expected_daemon=True)
|
|
|
afe0d5 |
|
|
|
afe0d5 |
def test_missing_transport(self):
|
|
|
afe0d5 |
- # UDP is default -- TODO?
|
|
|
afe0d5 |
- return True
|
|
|
afe0d5 |
+ # UDP is default -- TODO?
|
|
|
afe0d5 |
+ return True
|
|
|
afe0d5 |
config = re.sub('transport=.+\n', '', self.typical_config)
|
|
|
afe0d5 |
(pid, ret, stdout, stderr, runner) = \
|
|
|
afe0d5 |
self.run_booth(config_text=config, expected_exitcode=1, expected_daemon=False)
|
|
|
afe0d5 |
@@ -141,10 +141,10 @@ class ServerTests(ServerTestEnvironment):
|
|
|
afe0d5 |
self.assertRegexpMatches(stderr, 'ticket name "' + ticket + '" invalid')
|
|
|
afe0d5 |
|
|
|
afe0d5 |
def test_unreachable_peer(self):
|
|
|
afe0d5 |
- # what should this test do? daemon not expected, but no exitcode either?
|
|
|
afe0d5 |
- # booth would now just run, and try to reach that peer...
|
|
|
afe0d5 |
- # TCP reachability is not required during startup anymore.
|
|
|
afe0d5 |
- return True
|
|
|
afe0d5 |
+ # what should this test do? daemon not expected, but no exitcode either?
|
|
|
afe0d5 |
+ # booth would now just run, and try to reach that peer...
|
|
|
afe0d5 |
+ # TCP reachability is not required during startup anymore.
|
|
|
afe0d5 |
+ return True
|
|
|
afe0d5 |
config = re.sub('#(.+147.+)', lambda m: m.group(1), self.working_config)
|
|
|
afe0d5 |
self.run_booth(config_text=config,
|
|
|
afe0d5 |
expected_exitcode=None, expected_daemon=False)
|
|
|
afe0d5 |
--
|
|
|
afe0d5 |
2.18.0.rc2
|
|
|
afe0d5 |
|