Imported Debian patch 4.8.10-2

This commit is contained in:
Timo Aaltonen
2020-11-23 20:48:56 +02:00
committed by Mario Fetka
parent 8bc559c5a1
commit 358acdd85f
917 changed files with 1185414 additions and 1069733 deletions

View File

@@ -115,7 +115,7 @@ class test_hbactest(XMLRPC_test):
service=self.test_service,
rules=self.rule_names
)
assert ret['value'] == True
assert ret['value']
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'] == True
assert ret['error'] == None
assert ret['matched'] == None
assert ret['notmatched'] == None
assert ret['value']
assert ret['error'] is None
assert ret['matched'] is None
assert ret['notmatched'] is None
def test_c_hbactest_check_rules_enabled_detail(self):
"""
@@ -180,9 +180,9 @@ class test_hbactest(XMLRPC_test):
nodetail=True
)
assert ret['value'] == False
assert ret['matched'] == None
assert ret['notmatched'] == None
assert not ret['value']
assert ret['matched'] is None
assert ret['notmatched'] is None
for rule in self.rule_names:
assert u'%s_1x1' % (rule) in ret['error']