From 87efe51be0cf15bd7c7b47ccf66f1a33d352b0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 20 May 2017 12:56:23 +0200 Subject: [PATCH] tests: make firewall tests working regardless of python version Don't depend on set ordering... --- qubesagent/test_firewall.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qubesagent/test_firewall.py b/qubesagent/test_firewall.py index 55612ce..b6222c6 100644 --- a/qubesagent/test_firewall.py +++ b/qubesagent/test_firewall.py @@ -1,4 +1,5 @@ import logging +import operator from unittest import TestCase import qubesagent.firewall @@ -275,18 +276,20 @@ class TestIptablesWorker(TestCase): self.obj.called_commands[4] = [] self.obj.called_commands[6] = [] self.obj.cleanup() - self.assertEqual(self.obj.called_commands[4], + self.assertEqual([self.obj.called_commands[4][0]] + + sorted(self.obj.called_commands[4][1:], key=operator.itemgetter(1)), [['-F', 'QBS-FORWARD'], ['-F', 'chain-ip4-1'], ['-X', 'chain-ip4-1'], ['-F', 'chain-ip4-2'], ['-X', 'chain-ip4-2']]) - self.assertEqual(self.obj.called_commands[6], + self.assertEqual([self.obj.called_commands[6][0]] + + sorted(self.obj.called_commands[6][1:], key=operator.itemgetter(1)), [['-F', 'QBS-FORWARD'], - ['-F', 'chain-ip6-2'], - ['-X', 'chain-ip6-2'], ['-F', 'chain-ip6-1'], - ['-X', 'chain-ip6-1']]) + ['-X', 'chain-ip6-1'], + ['-F', 'chain-ip6-2'], + ['-X', 'chain-ip6-2']]) class TestNftablesWorker(TestCase):