Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: remove iptables_header content in test_622_qdb_keyboard_layout

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-10-22 09:26:03 +02:00
parent e667639914
commit 5ee97f4eeb
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qubes/tests/vm/qubesvm.py
View File

@ -1492,25 +1492,6 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
mock_qubesdb.rm.side_effect = test_qubesdb.rm mock_qubesdb.rm.side_effect = test_qubesdb.rm
vm.create_qdb_entries() vm.create_qdb_entries()
self.maxDiff = None 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, { self.assertEqual(test_qubesdb.data, {
'/name': 'test-inst-appvm', '/name': 'test-inst-appvm',
'/type': 'AppVM', '/type': 'AppVM',
@ -1528,7 +1509,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
'/qubes-usb-devices': '', '/qubes-usb-devices': '',
'/qubes-iptables': 'reload', '/qubes-iptables': 'reload',
'/qubes-iptables-error': '', '/qubes-iptables-error': '',
'/qubes-iptables-header': iptables_header, '/qubes-iptables-header': unittest.mock.ANY,
'/qubes-service/qubes-update-check': '0', '/qubes-service/qubes-update-check': '0',
'/qubes-service/meminfo-writer': '1', '/qubes-service/meminfo-writer': '1',
}) })