1 files changed, 32 insertions, 19 deletions
diff --git a/tests/shell.py b/tests/shell.py
index 2c9b3f5..2e8db5a 100644
--- a/tests/shell.py
+++ b/tests/shell.py
@@ -3,11 +3,30 @@ from operator import attrgetter
 from dogtail import tree
 from dogtail import predicate
 
-class Activity:
+ACTIVITIES_WITH_OBJECT_CHOOSER = ["Read", "Image Viewer", "Jukebox"]
+ACTIVITIES_MULTIPLE_STOP = ["Pippy"]
+
+class ActivityLauncher:
     def __init__(self, name=None, icon=None):
         self.name = name
         self.icon = icon
 
+def get_activity_launchers(shell):
+    # Make a list of activities by iterating the table
+    activity_launchers = []
+
+    table = shell.child(name="", roleName="table")
+    pred = predicate.GenericPredicate(roleName="table cell")
+    cells = table.findChildren(pred)
+
+    for row in [cells[i:i+5] for i in range(0, len(cells), 5)]:
+        launcher = ActivityLauncher(name=row[2].text, icon=row[1])
+        activity_launchers.append(launcher)
+
+    activity_launchers.sort(key=attrgetter("name"))
+
+    return activity_launchers
+
 shell = tree.root.child(name="sugar-session", roleName="application")
 
 # Complete the intro screen
@@ -18,29 +37,23 @@ done_button.click()
 radio_button = shell.child(name="List view", roleName="radio button")
 radio_button.click()
 
-# Make a list of activities by iterating the table
-activities = []
-
-table = shell.child(name="", roleName="table")
-cells = table.findChildren(predicate.GenericPredicate(roleName="table cell"))
-for row in [cells[i:i+5] for i in range(0, len(cells), 5)]:
-    activities.append(Activity(name=row[2].text, icon=row[1]))
-
-activities.sort(key=attrgetter("name"))
-
 # Launch and close all the activities
-for activity in activities:
-    print "Launching %s" % activity.name 
+for activity_launcher in get_activity_launchers(shell):
+    print "Launching %s" % activity_launcher.name 
 
-    activity.icon.click()
+    activity_launcher.icon.click()
 
-    # Some activities displays an object chooser, let's close it
-    if activity.name in ["Read", "Image Viewer", "Jukebox"]:
+    if activity_launcher.name in ACTIVITIES_WITH_OBJECT_CHOOSER:
         close_button = shell.child(name="Close", roleName="push button")
         close_button.click()
 
     activity = tree.root.child(name="sugar-activity", roleName="application")
 
-    pred = predicate.GenericPredicate(name="Stop", roleName="push button")
-    stop_buttons = activity.findChildren(pred)
-    stop_buttons[-1].click()
+    if activity_launcher.name in ACTIVITIES_MULTIPLE_STOP:
+        toolbar = activity.child(roleName="tool bar")
+        pred = predicate.GenericPredicate(name="Stop", roleName="push button")
+        stop_buttons = toolbar.findChildren(pred)
+        stop_buttons[-1].click()
+    else:
+        stop_button = activity.child(name="Stop", roleName="push button")
+        stop_button.click()