mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-10-26 08:55:13 +03:00
testmock: Remove some console mocking that's no longer required
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
parent
2c9f219450
commit
4941bb922f
@ -372,9 +372,7 @@ def testConsoleLXCSerial(app, dom):
|
||||
lib.utils.check(lambda: not win.showing)
|
||||
|
||||
|
||||
@_vm_wrapper("uitests-spice-specific",
|
||||
opts=["--test-options=spice-agent",
|
||||
"--test-options=fake-console-resolution"])
|
||||
@_vm_wrapper("uitests-spice-specific")
|
||||
def testConsoleSpiceSpecific(app, dom):
|
||||
"""
|
||||
Spice specific behavior. Has lots of devices that will open
|
||||
|
@ -474,9 +474,7 @@ class vmmConsolePages(vmmGObjectUI):
|
||||
|
||||
res = self._viewer.console_get_desktop_resolution()
|
||||
if res is None:
|
||||
if not self.config.CLITestOptions.fake_console_resolution:
|
||||
return
|
||||
res = (800, 600)
|
||||
return
|
||||
|
||||
scroll = self.widget("console-gfx-scroll")
|
||||
is_scale = self._viewer.console_get_scaling()
|
||||
|
@ -723,8 +723,7 @@ class SpiceViewer(Viewer):
|
||||
def _has_agent(self):
|
||||
if not self._main_channel:
|
||||
return False # pragma: no cover
|
||||
return (self._main_channel.get_property("agent-connected") or
|
||||
self.config.CLITestOptions.spice_agent)
|
||||
return self._main_channel.get_property("agent-connected")
|
||||
|
||||
def _open_host(self):
|
||||
host, port, tlsport = self._ginfo.get_conn_host()
|
||||
|
@ -165,14 +165,9 @@ class CLITestOptionsClass:
|
||||
* test-vm-run-fail: Make VM run fail, so we can test the error path
|
||||
* test-update-device-fail: Make UpdateDevice API call fail
|
||||
|
||||
* spice-agent: Make spice-agent detection return true in viewer.py
|
||||
|
||||
* firstrun-uri: If set, use this as the initial connection URI
|
||||
if we are doing firstrun testing
|
||||
* fake-vnc-username: Fake VNC username auth request
|
||||
* fake-console-resolution: Fake viewer console resolution response.
|
||||
Spice doesn't return values here when we are just testing
|
||||
against seabios in uitests, this fakes it to hit more code paths
|
||||
* fake-systray: Enable the fake systray window
|
||||
* fake-virtbootstrap: Mock the virtBootstrap module, since getting
|
||||
it to actually work across fedora versions is hard
|
||||
@ -221,10 +216,8 @@ class CLITestOptionsClass:
|
||||
self.test_managed_save = _get("test-managed-save")
|
||||
self.test_vm_run_fail = _get("test-vm-run-fail")
|
||||
self.test_update_device_fail = _get("test-update-device-fail")
|
||||
self.spice_agent = _get("spice-agent")
|
||||
self.firstrun_uri = _get_value("firstrun-uri")
|
||||
self.fake_vnc_username = _get("fake-vnc-username")
|
||||
self.fake_console_resolution = _get("fake-console-resolution")
|
||||
self.fake_systray = _get("fake-systray")
|
||||
self.object_denylist = _get_value("object-denylist")
|
||||
self.conn_crash = _get("conn-crash")
|
||||
|
Loading…
Reference in New Issue
Block a user