From e6913926b0e59704a1029de9df01ad2adb48ae00 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 11 Sep 2017 14:59:04 -0700
Subject: [PATCH] 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.
---
 needles/console/user_logged_in-biosfont.json |  41 ++++++++-----------
 needles/console/user_logged_in.json          |  11 +----
 needles/console/user_logged_in_qwerty.json   |  24 -----------
 needles/console/user_logged_in_qwerty.png    | Bin 1003 -> 0 bytes
 4 files changed, 19 insertions(+), 57 deletions(-)
 delete mode 100644 needles/console/user_logged_in_qwerty.json
 delete mode 100644 needles/console/user_logged_in_qwerty.png

diff --git a/needles/console/user_logged_in-biosfont.json b/needles/console/user_logged_in-biosfont.json
index a65c5311..84e80df8 100644
--- a/needles/console/user_logged_in-biosfont.json
+++ b/needles/console/user_logged_in-biosfont.json
@@ -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"
+    ]
 }
\ No newline at end of file
diff --git a/needles/console/user_logged_in.json b/needles/console/user_logged_in.json
index b7bdca0e..c547ba7e 100644
--- a/needles/console/user_logged_in.json
+++ b/needles/console/user_logged_in.json
@@ -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
         }
     ],
diff --git a/needles/console/user_logged_in_qwerty.json b/needles/console/user_logged_in_qwerty.json
deleted file mode 100644
index 54fe61a8..00000000
--- a/needles/console/user_logged_in_qwerty.json
+++ /dev/null
@@ -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": []
-}
\ No newline at end of file
diff --git a/needles/console/user_logged_in_qwerty.png b/needles/console/user_logged_in_qwerty.png
deleted file mode 100644
index f06fe8f4bedd2519e6c4f3804966caab24ceb719..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1003
zcmeAS@N?(olHy`uVBq!ia0y~yU;#3j85o&?R6|L-ACO`T@Ck7R(yLaj5>Bpv1C(Ci
z>EaktaqI2Py;;hhB5e=#gF+e)bG58rsC3aW-p5d<mHB9IQ}f}y?R#e@v8rc1V^cZf
z(kIF*-EoaAH*#L8)9R{&?}blH5%_V{f9eutP6mbtr)O`Orozo7?#X{iMRO~+2G^t~
z*+&omncuzShTenQG8<k^{WptwpXcY&T${-J<8u#%X})_~QD%FyB1dAw=e7Kfg&|$l
z`X{%3F3kAJ;j>sgc-E9hby_FCK1t4$nDF{VWeA_w#{lo5RQclH4ZC6*`scY<2K0#Q
z&$e9f(9Gs$!g9yUi=E=vteIcB>EV?R3cuE0z2sgTVf8@%p4|R9;hwKVOfo0UTsfKb
zq*dwr^~Wm(<>W-{>+8ilyP{UFI(2vJ)b*<8PrZJf`^?qHGj>n7!}?XLrtbcCVb%0K
ztG>Nw4BZ;;<+=O({iV^?a=Ka8>^1+_<s`1&8-8`|n-zCI?(%rP`S^MM8$SbVvaUp?
zf7REws+0+Rv*xpgKG)M-9-4Pm6SPvhW^K9js`BgS<wd@etIB_>=x-{Dy`z~BUA!{T
zQG4x{s@l+XmKwWGH}A>Nxqfsm(<yz%cc-?t{q&1x{`H%!LQhU~k^A)B$KS{${gn8y
ztz&lY@$>iF)|Y8rdu<qHGBeWV<`;?YX`9?5F9v+s#_{^==i;buH*$U@KKwMBRbC7j
z@df;Im%MBLvf!QB()tVu0o9{Asz;+8qO=~&x?pl3M|^u)x~ufA<SPdMvo7czusw3n
zR`Zucx5>L&4`1e0M<4xkJ`f_s-m|fyoZI5c9tVdC?hbC29}?ZapV>ZmRC(E8fw}ar
z@XcGRHt+KYd$Xl3?pX-WdvWf+SqA^2F5dH-BqzyIWBUB(`KpZ#pAy;iqy)sdZ_IrA
z_J+P#!ok}2hs!oDSBO4Wt^c@)G5NZzjlQJ7p@W|#rgInU*O4rcI@2|mtuN)z`Xl<H
z7tViX*nO6>?OqhylAnk2<1hCgoX#8YV|V5O8~zWs=Qu1h<DK!GQGdH-W0NW046jeq
zfnteQ%^n1Nmib_&9-;Q2Vz#ixpPObtH$VPrrXFxR_XfnoE8i4;-L+BJ#?Qgc_NPp)
mAoADWf{(yZ8z}Ih^$&M+{~F=F5BS_cZt!&Vb6Mw<&;$U{8l{l{