Switch back to the top frame when launching apps

malini · Nov 29, 2012 · 9fd8d8b · 9fd8d8b
1 parent 746797e
commit 9fd8d8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/gaiatest/gaia_test.py b/gaiatest/gaia_test.py
@@ -47,6 +47,7 @@ def __init__(self, marionette):
         self.marionette.import_script(js)
 
     def launch(self, name, switch_to_frame=True, url=None):
+        self.marionette.switch_to_frame()
         result = self.marionette.execute_async_script("GaiaApps.launchWithName('%s')" % name)
         app = GaiaApp(frame_id=result.get('frame'),
                       src=result.get('src'),

diff --git a/gaiatest/tests/unit/test_killall.py b/gaiatest/tests/unit/test_killall.py
@@ -11,7 +11,7 @@ def test_kill_all(self):
         self.lockscreen.unlock()
 
         for app in ['Calculator', 'Clock']:
-            self.apps.launch(app, switch_to_frame=False)
+            self.apps.launch(app)
 
         self.apps.kill_all()
         self.check_no_apps_running()
@@ -27,13 +27,13 @@ def test_kill_all_twice(self):
 
         apps = ['Calculator', 'Clock']
         for app in apps:
-            self.apps.launch(app, switch_to_frame=False)
+            self.apps.launch(app)
 
         self.apps.kill_all()
         self.check_no_apps_running()
 
         for app in apps:
-            self.apps.launch(app, switch_to_frame=False)
+            self.apps.launch(app)
 
         self.apps.kill_all()