Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix re-connecting via VNC over WebSockets #2136

Merged
merged 1 commit into from Jul 30, 2022
Merged

Conversation

Martchus
Copy link
Contributor

  • Before overriding the VNC hostname to 127.0.0.1 (to connect to
    dewebsockify), save the original hostname.
  • When checking whether VNC over WebSockets should be enabled, compare the
    configured VIRSH_GUEST with the saved hostname and not the overridden
    one.
  • This should fix the problem of the first test mentioned in
    https://progress.opensuse.org/issues/114820

@github-actions
Copy link

Great PR! Please pay attention to the following items before merging:

Files matching consoles/**.pm:

  • Consider running manual verification tests on real hardware, especially for non-qemu backends

This is an automatically generated QA checklist based on modified files

* Before overriding the VNC hostname to `127.0.0.1` (to connect to
  `dewebsockify`), save the original hostname.
* When checking whether VNC over WebSockets should be enabled, compare the
  configured `VIRSH_GUEST` with the saved hostname and not the overridden
  one.
* This should fix the problems mentioned in
  https://progress.opensuse.org/issues/114820
@codecov
Copy link

codecov bot commented Jul 29, 2022

Codecov Report

Merging #2136 (33e2b56) into master (1a85ca4) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #2136      +/-   ##
==========================================
+ Coverage   89.16%   89.17%   +0.01%     
==========================================
  Files         165      165              
  Lines       14187    14194       +7     
==========================================
+ Hits        12650    12658       +8     
+ Misses       1537     1536       -1     
Impacted Files Coverage Δ
consoles/VNC.pm 100.00% <ø> (ø)
consoles/VMWare.pm 100.00% <100.00%> (ø)
t/27-consoles-vmware.t 92.55% <100.00%> (+0.24%) ⬆️
t/07-commands.t 95.75% <0.00%> (+0.60%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1a85ca4...33e2b56. Read the comment docs.

@okurz
Copy link
Member

okurz commented Jul 30, 2022

We haven't tested it manually but let's see

@mergify mergify bot merged commit 1aca550 into os-autoinst:master Jul 30, 2022
@Martchus Martchus deleted the vnc branch July 30, 2022 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants