1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-12-11 13:53:08 +00:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Adam Williamson
1264ce4aca Add variant 'another file' needle for nautilus test
In today's Rawhide, for some reason, after we delete the first
file, the second file we want to delete is highlighted.
Previously the other file in the directory was highlighted. No
biggie, just handle both cases.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-04-11 11:16:59 -07:00
Adam Williamson
44147a67da Add some variant Fonts needles for Silverblue
There's a difference in the Info page and we get every font
twice on Silverblue because they're present in two locations.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-04-11 11:16:12 -07:00
Adam Williamson
a678f783cb nautilus delete_file: correct name of second file
The second file that we delete and don't restore is called
evince.pdf these days.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-04-11 11:15:05 -07:00
Adam Williamson
0271642f61 Adjust _check_install_source for more changes in anaconda
Another message changed format a bit, and all the messages are
now showing up in syslog instead of packaging.log, so handle
all possibilities here. I had to split the first check into two
commands because I can't seem to make it work if I try and do it
all in one command with bracket groups :/

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-04-11 10:58:09 -07:00
8 changed files with 59 additions and 6 deletions

View File

@ -0,0 +1,15 @@
{
"area": [
{
"height": 106,
"ypos": 96,
"width": 172,
"type": "match",
"xpos": 14
}
],
"properties": [],
"tags": [
"fonts_cantarell_info"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"xpos": 34,
"type": "match",
"ypos": 176,
"width": 954,
"height": 101
}
],
"properties": [
{
"name": "workaround",
"value": "fonts shown twice on Silverblue: https://github.com/fedora-silverblue/issue-tracker/issues/449"
}
],
"tags": [
"fonts_liberation_font_found"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -0,0 +1,15 @@
{
"area": [
{
"xpos": 270,
"type": "match",
"height": 20,
"width": 116,
"ypos": 137
}
],
"properties": [],
"tags": [
"nautilus_test_file_another"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -27,14 +27,17 @@ sub run {
# this line tells us it set up a repo for our URL. # this line tells us it set up a repo for our URL.
# "repo addrepo" is older format from before Fedora 37, # "repo addrepo" is older format from before Fedora 37,
# "Add the 'addrepo" is newer format from F37+ # "Add the 'addrepo" is newer format from F37+
assert_script_run 'grep "\(repo \|Add the \'\)addrepo.*' . ${addrepourl} . '" /tmp/packaging.log'; if (script_run 'grep "\(repo \|Add the \'\)addrepo.*' . ${addrepourl} . '" /tmp/packaging.log') {
# newer path from f39+: message is in syslog and look a bit different
assert_script_run 'grep "Add the \'addrepo.*file:///run/install/sources/mount-.000-nfs-device" /tmp/syslog';
}
# ...this line tells us it added the repo called 'addrepo' # ...this line tells us it added the repo called 'addrepo'
assert_script_run 'grep "Added the \'addrepo\'" /tmp/anaconda.log'; assert_script_run 'grep "Added the \'addrepo\'" /tmp/anaconda.log /tmp/syslog';
# ...and this tells us it worked (I hope). # ...and this tells us it worked (I hope).
assert_script_run 'grep "Load metadata for the \'addrepo\'" /tmp/anaconda.log'; assert_script_run 'grep "Load metadata for the \'addrepo\'" /tmp/anaconda.log /tmp/syslog';
# addrepo.nfs is from before Fedora 39, sources/mount-1000-nfs-device # addrepo.nfs is from before Fedora 39, sources/mount-1000-nfs-device
# is from F39+ # or mount-0000-nfs-device is from F39+
assert_script_run 'grep -E "Loaded metadata from.*file:///run/install/(addrepo.nfs|sources/mount-1000-nfs-device)" /tmp/anaconda.log'; assert_script_run 'grep -E "Loaded metadata from.*file:///run/install/(addrepo.nfs|sources/mount-.000-nfs-device)" /tmp/anaconda.log /tmp/syslog';
} }
} }
if ($repourl =~ /^hd:/) { if ($repourl =~ /^hd:/) {

View File

@ -63,7 +63,7 @@ sub run {
assert_script_run("ls /home/test/Documents/markdown.md", timeout => '60', fail_message => 'The file has not been found in the location.', quiet => '0'); assert_script_run("ls /home/test/Documents/markdown.md", timeout => '60', fail_message => 'The file has not been found in the location.', quiet => '0');
# Verify that the next file has been deleted from the original location # Verify that the next file has been deleted from the original location
assert_script_run("! ls /home/test/Documents/konkurz.md"); assert_script_run("! ls /home/test/Documents/evince.pdf");
} }
sub test_flags { sub test_flags {