Fix browser starting + allow for frametime in web experiments

Author: mhkarsten

AndroidRunner/Browsers/Browser.py

@@ -11,8 +11,17 @@ def __init__(self, package_name, main_activity):
 
     def start(self, device):
         self.logger.info('%s: Start' % device.id)
-        device.launch_activity(self.package_name, self.main_activity, from_scratch=True, force_stop=True,
-                               action='android.intent.action.VIEW')
+        
+        kwargs = {
+            'from_scratch': True, 
+            'force_stop':   True,
+            'action':       'android.intent.action.VIEW',
+        }
+
+        if device != None and int(device.get_version()) > 12:
+            kwargs['data_uri'] = "about:blank"
+
+        device.launch_activity(self.package_name, self.main_activity, **kwargs)
 
     def load_url(self, device, url):
         self.logger.info('%s: Load URL: %s' % (device.id, url))

tests/unit/test_browsers.py

@@ -62,6 +62,7 @@ def test_start(self, mock_log, browser):
         browser.main_activity = mock_main_activity
         mock_device = Mock()
         mock_device.id = "fake_device"
+        mock_device.get_version.return_value = "10"
         browser.start(mock_device)
         mock_log.assert_called_once_with('fake_device: Start')
         mock_device.launch_activity.assert_called_once_with(mock_package_name, mock_main_activity, from_scratch=True,

tests/unit/test_experiment.py

@@ -951,6 +951,11 @@ def test_run(self, before_run, after_launch, start_profiling, interaction, stop_
         web_experiment.browsers = [mock_browser]
         web_experiment.run(mock_device, path, run, 'chrome')
 
+        kwargs = {
+            "browser": mock_browser,
+            "app": mock_browser.package_name
+        }
+
         mock_manager = Mock()
         mock_manager.attach_mock(before_run, "before_run_managed")
         mock_manager.attach_mock(after_launch, "after_launch_managed")
@@ -962,13 +967,17 @@ def test_run(self, before_run, after_launch, start_profiling, interaction, stop_
 
         web_experiment.run(mock_device, path, run, 'chrome')
 
-        expected_calls = [call.before_run_managed(mock_device, path, run, browser=mock_browser),
-                          call.after_launch_managed(mock_device, path, run, browser=mock_browser),
-                          call.start_profiling_managed(mock_device, path, run, browser=mock_browser),
-                          call.interaction_managed(mock_device, path, run, browser=mock_browser),
-                          call.stop_profiling_managed(mock_device, path, run, browser=mock_browser),
-                          call.before_close_managed(mock_device, path, run, browser=mock_browser),
-                          call.after_run_managed(mock_device, path, run, browser=mock_browser)]
+        expected_calls = [call.before_run_managed(mock_device, path, run, **kwargs),
+                          call.after_launch_managed(mock_device, path, run, **kwargs),
+                          call.start_profiling_managed(mock_device, path, run, **kwargs),
+                          call.interaction_managed(mock_device, path, run, **kwargs),
+                          call.stop_profiling_managed(mock_device, path, run, **kwargs),
+                          call.before_close_managed(mock_device, path, run, **kwargs),
+                          call.after_run_managed(mock_device, path, run, **kwargs)]
+        
+        from pprint import pprint
+        pprint(mock_manager.mock_calls)
+        pprint(expected_calls)
         assert mock_manager.mock_calls == expected_calls
 
     @patch('AndroidRunner.WebExperiment.WebExperiment.after_run')
@@ -994,8 +1003,10 @@ def test_premature_stoppable_run(self, queue, premature_stoppable_run_run, prema
         web_experiment.browsers = [mock_browser]
         web_experiment.run_stopping_condition_config = run_stopping_condition_config
         web_experiment.queue = queue
+
         kwargs = {
-            'browser': mock_browser
+            'browser': mock_browser,
+            'app': mock_browser.package_name
         }
 
         queue_value = None