From 382e7f02cad616666fa421860d42f089788a2084 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Sat, 21 Mar 2015 12:53:27 -0700 Subject: [PATCH] BF: expect ['error'] as a value if no dns module available As many buildbots show: e.g. http://nipy.bic.berkeley.edu/builders/fail2ban-py2.7-osx-10.8_master/builds/163/steps/shell_1/logs/stdio --- fail2ban/tests/servertestcase.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fail2ban/tests/servertestcase.py b/fail2ban/tests/servertestcase.py index 2475fa99..8c5e99a8 100644 --- a/fail2ban/tests/servertestcase.py +++ b/fail2ban/tests/servertestcase.py @@ -511,6 +511,14 @@ class Transmitter(TransmitterBase): ) def testJailStatusCymru(self): + try: + import dns.exception + import dns.resolver + except ImportError: + value = ['error'] + else: + value = [] + self.assertEqual(self.transm.proceed(["status", self.jailName, "cymru"]), (0, [ @@ -523,9 +531,9 @@ class Transmitter(TransmitterBase): ('Currently banned', 0), ('Total banned', 0), ('Banned IP list', []), - ('Banned ASN list', []), - ('Banned Country list', []), - ('Banned RIR list', [])] + ('Banned ASN list', value), + ('Banned Country list', value), + ('Banned RIR list', value)] ) ] )