From 2defc4cddbd09fd919c8972ab64cc498d8ac260a Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Wed, 09 Jan 2013 23:19:13 +0000
Subject: root_accessible might be None too

---
(limited to 'tests/sugar/tree.py')

diff --git a/tests/sugar/tree.py b/tests/sugar/tree.py
index 6607371..9a81f11 100644
--- a/tests/sugar/tree.py
+++ b/tests/sugar/tree.py
@@ -8,15 +8,15 @@ Atspi.set_timeout(-1, -1)
 
 
 def get_root(wait=True):
-    desktop = Node(Atspi.get_desktop(0))
-
-    if not wait:
-        return desktop
-
     n_tries = 0
-    while n_tries < 50:
-        if desktop.get_children():
-            return desktop
+    while n_tries < 5:
+        root_accessible = Atspi.get_desktop(0)
+        if root_accessible:
+            desktop = Node(root_accessible)
+            if desktop.get_children():
+                return desktop
+            elif not wait:
+                return None
 
         n_tries = n_tries + 1
         logging.info("Waiting for a valid accessibility tree %d" % n_tries)
--
cgit v0.9.1