Milan Zamazal has uploaded a new change for review. Change subject: tests: Set vars/ssl to true in graphics tests ......................................................................
tests: Set vars/ssl to true in graphics tests In 8a7479c, support for graphics defaultMode was added and defaultMode="secure" is now expected in test outputs. However this is only present when vars/ssl configuration option is set to true. We must ensure this is so by monkey patching the corresponding graphics tests. Otherwise the configuration value from /etc/vdsm/vdsm.conf (if present) is apparently used and the tests may fail if the value is false. Change-Id: I31df7639f23f9cf813d0baf1bb102920bea76736 Signed-off-by: Milan Zamazal <[email protected]> --- M tests/deviceTests.py 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/60973/1 diff --git a/tests/deviceTests.py b/tests/deviceTests.py index c24b119..618f8a1 100644 --- a/tests/deviceTests.py +++ b/tests/deviceTests.py @@ -28,7 +28,7 @@ from virt.domain_descriptor import DomainDescriptor from monkeypatch import MonkeyPatch, MonkeyPatchScope -from testlib import permutations, expandPermutations +from testlib import permutations, expandPermutations, make_config from testlib import VdsmTestCase as TestCaseBase from testlib import XMLTestCase import vmfakelib as fake @@ -545,6 +545,8 @@ self.assertEqual(graphDev.port, graphConf['port']) self.assertEqual(graphDev.tlsPort, graphConf['tlsPort']) + @MonkeyPatch(graphics, 'config', + make_config([('vars', 'ssl', 'true')])) def testLegacyGraphicsXML(self): vmConfs = [ {'display': 'vnc', 'displayPort': '-1', 'displayNetwork': @@ -566,6 +568,8 @@ for vmConf, xml in zip(vmConfs, self.GRAPHICS_XMLS): self._verifyGraphicsXML(vmConf, xml, isLegacy=True) + @MonkeyPatch(graphics, 'config', + make_config([('vars', 'ssl', 'true')])) def testGraphicsDeviceXML(self): vmConfs = [ {'devices': [{ -- To view, visit https://gerrit.ovirt.org/60973 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31df7639f23f9cf813d0baf1bb102920bea76736 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Milan Zamazal <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/admin/lists/[email protected]
