From b4be3cc062f5d236d4d52d16fb1e5eaa7de3df0a Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 9 Apr 2019 09:50:48 +0200 Subject: [PATCH] Any order is good for SetACL. --- regression-tests.dnsdist/test_API.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/regression-tests.dnsdist/test_API.py b/regression-tests.dnsdist/test_API.py index 3d751cfe8c..8ec87804a7 100644 --- a/regression-tests.dnsdist/test_API.py +++ b/regression-tests.dnsdist/test_API.py @@ -360,24 +360,36 @@ class TestAPIWritable(DNSDistTest): self.assertEquals(r.status_code, 200) self.assertTrue(r.json()) content = r.json() - self.assertEquals(content['value'], newACL) + acl = content['value'] + acl.sort() + self.assertEquals(acl, newACL) r = requests.get(url, headers=headers, timeout=self._webTimeout) self.assertTrue(r) self.assertEquals(r.status_code, 200) self.assertTrue(r.json()) content = r.json() - self.assertEquals(content['value'], newACL) + acl = content['value'] + acl.sort() + self.assertEquals(acl, newACL) configFile = self._APIWriteDir + '/' + 'acl.conf' self.assertTrue(os.path.isfile(configFile)) fileContent = None with open(configFile, 'rt') as f: - fileContent = f.read() - - self.assertEquals(fileContent, """-- Generated by the REST API, DO NOT EDIT -setACL({"192.0.2.0/24", "198.51.100.0/24", "203.0.113.0/24"}) -""") + header = f.readline() + body = f.readline() + + self.assertEquals(header, """-- Generated by the REST API, DO NOT EDIT\n""") + + self.assertIn(body, { + """setACL({"192.0.2.0/24", "198.51.100.0/24", "203.0.113.0/24"})\n""", + """setACL({"192.0.2.0/24", "203.0.113.0/24", "198.51.100.0/24"})\n""", + """setACL({"198.51.100.0/24", "192.0.2.0/24", "203.0.113.0/24"})\n""", + """setACL({"198.51.100.0/24", "203.0.113.0/24", "192.0.2.0/24"})\n""", + """setACL({"203.0.113.0/24", "192.0.2.0/24", "198.51.100.0/24"})\n""", + """setACL({"203.0.113.0/24", "198.51.100.0/24", "192.0.2.0/24"})\n""" + }) class TestAPICustomHeaders(DNSDistTest): -- 2.47.2