From 3df993404caf085457cf355f7afb9c09b147dc5e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 5 Aug 2015 09:15:41 -0700 Subject: [PATCH] needle tweaks for eurlatgr font in anaconda Summary: I discovered another fun font issue today. Current anaconda images don't use the intended 'default' console font, eurlatgr. Neither do live images, but installed systems *do*. The font they use is the system BIOS font, which in openQA cases means the qemu firmware font. The easiest way to spot the difference is the @ character; the shorter version is from the system BIOS, the slightly taller one is what it looks like in eurlatgr and latarcyrheb-sun16 (the old default). In a test image I built, for some reason, I *did* get eurlatgr in the tmux console, and that broke some needle matches. After figuring all this out, bcl has sent a lorax patch to use eurlatgr in the installer, so it makes sense to add these fixes to the repo for when that kicks in. We shrink the match on root_logged_in.json by one line. This screenshot is taken from a post-install case where the prompt appears in the middle of the screen, and has three black rows above the prompt; in anaconda, when the prompt appears right at the top of the screen, there's only *two* rows of black above it, so the match fails. This fixes that. It's been working so far because installs have been matching root_logged_in_ rawhide20150311, which is taken with the firmware font, but once the installer starts using eurlatgr, that won't match any more. We also add a new needle for the anaconda_install_source_check _repo_added tag, taken with eurlatgr. The existing screenshot was taken either with the firmware font or with latarcyrheb. They both use a curly glyph for a single quote ('), while eurlatgr uses a straight line. This also renames the root_logged_in variant needle to be clearer about why it's there. We'll probably need variants of some needles until we're sure lives, anaconda env, and installed systems are all using eurlatgr. RHBZ #1250262 is a bug I filed for the live images not using eurlatgr. Test Plan: Run the tests with both BIOS font and eurlatgr as the anaconda font and make sure they all work. The latter might be a bit tricky till the change lands upstream, I've no idea how it worked out that way in my test boot.iso. Reviewers: jskladan, garretraziel Reviewed By: garretraziel Subscribers: tflink Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D483 --- ...tall_source_check_repo_added_eurlatgr.json | 18 ++++++++++++++++++ ...stall_source_check_repo_added_eurlatgr.png | Bin 0 -> 9885 bytes needles/root_logged_in.json | 6 +++--- ...0311.json => root_logged_in_biosfont.json} | 0 ...150311.png => root_logged_in_biosfont.png} | Bin 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 needles/anaconda_install_source_check_repo_added_eurlatgr.json create mode 100644 needles/anaconda_install_source_check_repo_added_eurlatgr.png rename needles/{root_logged_in_rawhide20150311.json => root_logged_in_biosfont.json} (100%) rename needles/{root_logged_in_rawhide20150311.png => root_logged_in_biosfont.png} (100%) diff --git a/needles/anaconda_install_source_check_repo_added_eurlatgr.json b/needles/anaconda_install_source_check_repo_added_eurlatgr.json new file mode 100644 index 00000000..23c44e64 --- /dev/null +++ b/needles/anaconda_install_source_check_repo_added_eurlatgr.json @@ -0,0 +1,18 @@ +{ + "tags": [ + "anaconda_install_source_check_repo_added", + "ENV-DISTRI-fedora", + "ENV-INSTLANG-en_US", + "ENV-OFW-1", + "ENV-FLAVOR-server" + ], + "area": [ + { + "ypos": 17, + "height": 14, + "xpos": 102, + "type": "match", + "width": 304 + } + ] +} \ No newline at end of file diff --git a/needles/anaconda_install_source_check_repo_added_eurlatgr.png b/needles/anaconda_install_source_check_repo_added_eurlatgr.png new file mode 100644 index 0000000000000000000000000000000000000000..8586617506f944a0af92f9f6f330c86fba6a9670 GIT binary patch literal 9885 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 L_I15`_OJg5s(ekm literal 0 HcmV?d00001 diff --git a/needles/root_logged_in.json b/needles/root_logged_in.json index bc0b9a7d..1d7c3779 100644 --- a/needles/root_logged_in.json +++ b/needles/root_logged_in.json @@ -1,11 +1,11 @@ { "area": [ { - "height": 17, + "height": 16, "type": "match", "width": 40, "xpos": 7, - "ypos": 111 + "ypos": 112 }, { "height": 14, @@ -23,4 +23,4 @@ "ENV-INSTLANG-en_US", "ENV-FLAVOR-server" ] -} \ No newline at end of file +} diff --git a/needles/root_logged_in_rawhide20150311.json b/needles/root_logged_in_biosfont.json similarity index 100% rename from needles/root_logged_in_rawhide20150311.json rename to needles/root_logged_in_biosfont.json diff --git a/needles/root_logged_in_rawhide20150311.png b/needles/root_logged_in_biosfont.png similarity index 100% rename from needles/root_logged_in_rawhide20150311.png rename to needles/root_logged_in_biosfont.png