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

Merge remote-tracking branch 'origin/pr/405'

Browse Source 
* origin/pr/405:
  Test that quotes and ampersand are XML escaped
This commit is contained in:
Marek Marczykowski-Górecki 2021-05-13 20:04:29 +02:00
commit 7c62e9703c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -961,7 +961,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
<loader type="rom">hvmloader</loader> <loader type="rom">hvmloader</loader>
<boot dev="cdrom" /> <boot dev="cdrom" />
<boot dev="hd" /> <boot dev="hd" />
<cmdline>kernel &lt;text&gt; specific options</cmdline> <cmdline>kernel &lt;text&gt;&#39;&#34;&amp; specific options</cmdline>
</os> </os>
<features> <features>
<pae/> <pae/>
@ -1000,7 +1000,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
open(os.path.join(kernel_dir, 'initramfs'), 'w').close() open(os.path.join(kernel_dir, 'initramfs'), 'w').close()
with open(os.path.join(kernel_dir, with open(os.path.join(kernel_dir,
'default-kernelopts-common.txt'), 'w') as f: 'default-kernelopts-common.txt'), 'w') as f:
f.write('kernel <text> specific options \n') f.write('kernel <text>\'"& specific options \n')
self.addCleanup(shutil.rmtree, '/tmp/qubes-test') self.addCleanup(shutil.rmtree, '/tmp/qubes-test')
vm.kernel = 'dummy' vm.kernel = 'dummy'
libvirt_xml = vm.create_config_file() libvirt_xml = vm.create_config_file()