From ea680c588779cbc11846a6da8a86e470893c6435 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Wed, 9 Mar 2011 16:14:37 -0600
Subject: Fixed test robustness.

---
 install/ui/test/functional/group-add-member-user.html    | 2 +-
 install/ui/test/functional/group-add.html                | 4 ++--
 install/ui/test/functional/group-delete-member-user.html | 4 ++--
 install/ui/test/functional/user-activation.html          | 3 +--
 install/ui/test/functional/user-add.html                 | 4 ++--
 install/ui/test/functional/user-del.html                 | 1 -
 install/ui/test/functional/user-mod.html                 | 4 ++--
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/install/ui/test/functional/group-add-member-user.html b/install/ui/test/functional/group-add-member-user.html
index 421c3e14..c7ae7725 100755
--- a/install/ui/test/functional/group-add-member-user.html
+++ b/install/ui/test/functional/group-add-member-user.html
@@ -53,7 +53,7 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='group']/span[@name='association']/table/tbody/tr/td[1]/input[@value='testuser']</td>
+	<td>//div[@id='group']/span[@name='association']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/install/ui/test/functional/group-add.html b/install/ui/test/functional/group-add.html
index c6b7995c..ba9c6005 100644
--- a/install/ui/test/functional/group-add.html
+++ b/install/ui/test/functional/group-add.html
@@ -32,8 +32,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='group']/span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/group-delete-member-user.html b/install/ui/test/functional/group-delete-member-user.html
index b8e62407..10476f11 100755
--- a/install/ui/test/functional/group-delete-member-user.html
+++ b/install/ui/test/functional/group-delete-member-user.html
@@ -28,12 +28,12 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='group']/span[@name='association']/table/tbody/tr/td[1]/input[@value='testuser']</td>
+	<td>//div[@id='group']/span[@name='association']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='group']/span[@name='association']/table/tbody/tr/td[1]/input[@value='testuser']</td>
+	<td>//div[@id='group']/span[@name='association']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/install/ui/test/functional/user-activation.html b/install/ui/test/functional/user-activation.html
index ab6ec05c..9bf3a2a2 100644
--- a/install/ui/test/functional/user-activation.html
+++ b/install/ui/test/functional/user-activation.html
@@ -18,7 +18,7 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>css=span[name=nsaccountlock] a[title=Active]</td>
+	<td>css=span[name=nsaccountlock] a</td>
 	<td></td>
 </tr>
 <tr>
@@ -66,7 +66,6 @@
 	<td>2 users matched</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/user-add.html b/install/ui/test/functional/user-add.html
index 9d92e57b..26c17094 100644
--- a/install/ui/test/functional/user-add.html
+++ b/install/ui/test/functional/user-add.html
@@ -37,8 +37,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='user']/span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/user-del.html b/install/ui/test/functional/user-del.html
index 4b1d1e4c..4c8f1e69 100644
--- a/install/ui/test/functional/user-del.html
+++ b/install/ui/test/functional/user-del.html
@@ -31,7 +31,6 @@
 	<td>1 user matched</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/user-mod.html b/install/ui/test/functional/user-mod.html
index f39b22fb..746f977a 100644
--- a/install/ui/test/functional/user-mod.html
+++ b/install/ui/test/functional/user-mod.html
@@ -58,8 +58,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='user']/span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
-- 
cgit