From 5ee97f4eebc48833fccba71d613c848decbc3249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Tue, 22 Oct 2019 09:26:03 +0200 Subject: [PATCH] tests: remove iptables_header content in test_622_qdb_keyboard_layout --- qubes/tests/vm/qubesvm.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/qubes/tests/vm/qubesvm.py b/qubes/tests/vm/qubesvm.py index fafb2353..6cb55f55 100644 --- a/qubes/tests/vm/qubesvm.py +++ b/qubes/tests/vm/qubesvm.py @@ -1492,25 +1492,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase): mock_qubesdb.rm.side_effect = test_qubesdb.rm vm.create_qdb_entries() self.maxDiff = None - - iptables_header = ( - '# Generated by Qubes Core on {}\n' - '*filter\n' - ':INPUT DROP [0:0]\n' - ':FORWARD DROP [0:0]\n' - ':OUTPUT ACCEPT [0:0]\n' - '-A INPUT -i vif+ -p udp -m udp --dport 68 -j DROP\n' - '-A INPUT -m conntrack --ctstate ' - 'RELATED,ESTABLISHED -j ACCEPT\n' - '-A INPUT -p icmp -j ACCEPT\n' - '-A INPUT -i lo -j ACCEPT\n' - '-A INPUT -j REJECT --reject-with ' - 'icmp-host-prohibited\n' - '-A FORWARD -m conntrack --ctstate ' - 'RELATED,ESTABLISHED -j ACCEPT\n' - '-A FORWARD -i vif+ -o vif+ -j DROP\n' - 'COMMIT\n'.format(datetime.datetime.now().ctime())) - self.assertEqual(test_qubesdb.data, { '/name': 'test-inst-appvm', '/type': 'AppVM', @@ -1528,7 +1509,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase): '/qubes-usb-devices': '', '/qubes-iptables': 'reload', '/qubes-iptables-error': '', - '/qubes-iptables-header': iptables_header, + '/qubes-iptables-header': unittest.mock.ANY, '/qubes-service/qubes-update-check': '0', '/qubes-service/meminfo-writer': '1', })