Imported Debian patch 4.7.2-3

This commit is contained in:
Timo Aaltonen
2019-05-06 08:43:34 +03:00
committed by Mario Fetka
parent 27edeba051
commit 8bc559c5a1
917 changed files with 1068993 additions and 1184676 deletions

View File

@@ -115,7 +115,7 @@ class test_hbactest(XMLRPC_test):
service=self.test_service,
rules=self.rule_names
)
assert ret['value']
assert ret['value'] == True
assert ret['error'] is None
for i in [0,1,2,3]:
assert self.rule_names[i] in ret['matched']
@@ -131,10 +131,10 @@ class test_hbactest(XMLRPC_test):
rules=self.rule_names,
nodetail=True
)
assert ret['value']
assert ret['error'] is None
assert ret['matched'] is None
assert ret['notmatched'] is None
assert ret['value'] == True
assert ret['error'] == None
assert ret['matched'] == None
assert ret['notmatched'] == None
def test_c_hbactest_check_rules_enabled_detail(self):
"""
@@ -180,9 +180,9 @@ class test_hbactest(XMLRPC_test):
nodetail=True
)
assert not ret['value']
assert ret['matched'] is None
assert ret['notmatched'] is None
assert ret['value'] == False
assert ret['matched'] == None
assert ret['notmatched'] == None
for rule in self.rule_names:
assert u'%s_1x1' % (rule) in ret['error']