Tweak user_logged_in needles a bit

Matching on the user name really isn't doing much good. It just
means we need more variant needles. Let's ditch that part of the
match and just match on the distinctive character sequence ~]$,
which doesn't really occur for any other reason. With this we
can drop the separate 'qwerty' needle (since the qwerty case
will match the regular needle now) and should also handle the
FreeIPA tests that are failing in Rawhide because a logged in
FreeIPA user doesn't just have a sh prompt now.
This commit is contained in:
Adam Williamson 2017-09-11 14:59:04 -07:00
parent 99a203b8e0
commit e6913926b0
4 changed files with 19 additions and 57 deletions

View File

@ -1,25 +1,18 @@
{
"properties": [],
"tags": [
"user_logged_in",
"user_console",
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server"
],
"area": [
{
"ypos": 95,
"width": 41,
"height": 14,
"xpos": 7,
"type": "match"
},
{
"xpos": 136,
"ypos": 93,
"width": 17,
"height": 17,
"type": "match"
}
]
{
"area": [
{
"height": 17,
"type": "match",
"width": 27,
"xpos": 126,
"ypos": 93
}
],
"properties": [],
"tags": [
"user_logged_in",
"user_console",
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server"
]
}

View File

@ -3,15 +3,8 @@
{
"height": 14,
"type": "match",
"width": 41,
"xpos": 7,
"ypos": 95
},
{
"height": 14,
"type": "match",
"width": 17,
"xpos": 136,
"width": 27,
"xpos": 126,
"ypos": 96
}
],

View File

@ -1,24 +0,0 @@
{
"area": [
{
"type": "match",
"width": 57,
"height": 15,
"ypos": 97,
"xpos": 8
},
{
"type": "match",
"width": 17,
"ypos": 93,
"height": 17,
"xpos": 152
}
],
"tags": [
"user_logged_in",
"user_console",
"ENV-DISTRI-fedora"
],
"properties": []
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1003 B