Proxy BBT fetch requests on Android using adb reverse

b/165629644

Change-Id: If0b7393a9582c7d68978add9a4d1e0a6505b437e

cobalt/black_box_tests/black_box_cobalt_runner.py

@@ -50,6 +50,7 @@ def __init__(self,
                target_params=None,
                success_message=None,
                poll_until_wait_seconds=POLL_UNTIL_WAIT_SECONDS,
+               web_server_port=None,
                **kwargs):
     # For black box tests, don't log inline script warnings, we intend to
     # explicitly control timings for suspends and resumes, so we are not
@@ -65,6 +66,7 @@ def __init__(self,
         target_params,
         success_message,
         poll_until_wait_seconds=poll_until_wait_seconds,
+        web_server_port=web_server_port,
         **kwargs)
 
     self.poll_until_wait_seconds = poll_until_wait_seconds

cobalt/black_box_tests/black_box_tests.py

@@ -146,7 +146,11 @@ def tearDownClass(cls):
     super(BlackBoxTestCase, cls).tearDownClass()
     logging.info('Done %s', cls.__name__)
 
-  def CreateCobaltRunner(self, url=None, target_params=None, **kwargs):
+  def CreateCobaltRunner(self,
+                         url=None,
+                         target_params=None,
+                         web_server_port=None,
+                         **kwargs):
     all_target_params = list(target_params) if target_params else []
     if _launcher_params.target_params is not None:
       all_target_params += _launcher_params.target_params
@@ -155,6 +159,7 @@ def CreateCobaltRunner(self, url=None, target_params=None, **kwargs):
         launcher_params=_launcher_params,
         url=url,
         target_params=all_target_params,
+        web_server_port=web_server_port,
         **kwargs)
 
   def GetBindingAddress(self):

cobalt/black_box_tests/tests/allow_eval.py

@@ -29,5 +29,6 @@ def test_allow_eval(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(file_name='testdata/allow_eval.html')
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/cancel_sync_loads_when_suspended.py

@@ -95,7 +95,8 @@ def test_cancel_sync_loads_when_suspended(self):
     try:
       with ThreadedWebServer(JavascriptRequestDetector,
                              self.GetBindingAddress()) as server:
-        with self.CreateCobaltRunner(url='about:blank') as runner:
+        with self.CreateCobaltRunner(
+            url='about:blank', web_server_port=server.GetPort()) as runner:
           target_url = server.GetURL(file_name='../testdata/' +
                                      _CANCEL_SYNC_LOADS_WHEN_SUSPENDED_HTML)
           cobalt_launcher_thread = threading.Thread(

cobalt/black_box_tests/tests/compression_test.py

@@ -128,7 +128,8 @@ def execute_test(test_runner, encoding_type):
       handler=make_request_handler_class(path, encoding_type)) as server:
     url = server.GetURL(file_name='testdata/compression.html')
 
-    with test_runner.CreateCobaltRunner(url=url) as runner:
+    with test_runner.CreateCobaltRunner(
+        url=url, web_server_port=server.GetPort()) as runner:
       test_runner.assertTrue(runner.JSTestsSucceeded())
 
 

cobalt/black_box_tests/tests/conceal_visibility.py

@@ -29,7 +29,8 @@ def test_conceal_visibility(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(file_name='testdata/conceal_visibility.html')
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         runner.SendConceal()
         runner.SendFocus()

cobalt/black_box_tests/tests/deep_links.py

@@ -104,7 +104,8 @@ def _send_link(self, query_parameter=''):
     try:
       with ThreadedWebServer(JavascriptRequestDetector,
                              self.GetBindingAddress()) as server:
-        with self.CreateCobaltRunner(url='about:blank') as runner:
+        with self.CreateCobaltRunner(
+            url='about:blank', web_server_port=server.GetPort()) as runner:
           target_url = server.GetURL(file_name='../testdata/' +
                                      _DEEP_LINKS_HTML)
           if query_parameter != '':
@@ -151,7 +152,9 @@ def _start_link(self, query_parameter=''):
       initial_deep_link = 'link 3'  # Expected by our test JS
 
       with self.CreateCobaltRunner(
-          url=url, target_params=['--link=' + initial_deep_link]) as runner:
+          url=url,
+          target_params=['--link=' + initial_deep_link],
+          web_server_port=server.GetPort()) as runner:
         success = runner.JSTestsSucceeded()
         if success:
           logging.info('[ OK ] %s', inspect.stack()[1][3])
@@ -167,7 +170,8 @@ def _delayed_link(self, query_parameter=''):
     try:
       with ThreadedWebServer(JavascriptRequestDetector,
                              self.GetBindingAddress()) as server:
-        with self.CreateCobaltRunner(url='about:blank') as runner:
+        with self.CreateCobaltRunner(
+            url='about:blank', web_server_port=server.GetPort()) as runner:
           target_url = server.GetURL(file_name='../testdata/' +
                                      _DEEP_LINKS_HTML)
           if query_parameter != '':

cobalt/black_box_tests/tests/disable_eval_with_csp.py

@@ -29,5 +29,6 @@ def test_disable_eval_with_csp(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(file_name='testdata/disable_eval_with_csp.html')
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/evergreen_verify_qa_channel_update_test.py

@@ -31,7 +31,8 @@ def test_evergreen_verify_qa_channel_update(self):
       with self.CreateCobaltRunner(
           url=url,
           target_params=['--update_check_delay_seconds=300'],
-          loader_target='loader_app') as runner:
+          loader_target='loader_app',
+          web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())
 
@@ -41,8 +42,10 @@ def test_evergreen_verify_qa_channel_update(self):
       # 100 seconds provides enough time for the initial update delay, the prod
       # channel update, and the target channel update.
       with self.CreateCobaltRunner(
-          url=url, poll_until_wait_seconds=100,
-          loader_target='loader_app') as runner:
+          url=url,
+          poll_until_wait_seconds=100,
+          loader_target='loader_app',
+          web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())
 
@@ -52,8 +55,10 @@ def test_evergreen_verify_qa_channel_update(self):
       # 60 seconds provides enough time for the initial update delay and target
       # channel update check.
       with self.CreateCobaltRunner(
-          url=url, poll_until_wait_seconds=60,
-          loader_target='loader_app') as runner:
+          url=url,
+          poll_until_wait_seconds=60,
+          loader_target='loader_app',
+          web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())
 
@@ -63,6 +68,7 @@ def test_evergreen_verify_qa_channel_update(self):
       with self.CreateCobaltRunner(
           url=url,
           target_params=['--update_check_delay_seconds=300'],
-          loader_target='loader_app') as runner:
+          loader_target='loader_app',
+          web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/freeze_timers.py

@@ -31,7 +31,8 @@ def test_freeze_visibility(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(file_name='testdata/freeze_timers.html')
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         time.sleep(2.5)
         runner.SendConceal()

cobalt/black_box_tests/tests/freeze_visibility.py

@@ -29,7 +29,8 @@ def test_freeze_visibility(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(file_name='testdata/freeze_visibility.html')
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         runner.SendFreeze()
         runner.SendFocus()

cobalt/black_box_tests/tests/h5vcc_storage_write_verify_test.py

@@ -27,6 +27,7 @@ def test_h5vcc_storage_write_verify_test(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(
           file_name='testdata/h5vcc_storage_write_verify_test.html')
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForActiveElement()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/http_cache.py

@@ -49,5 +49,6 @@ def test_http_cache(self):
         binding_address=self.GetBindingAddress(),
         handler=DelayedHttpRequestHandler) as server:
       url = server.GetURL(file_name='testdata/http_cache.html')
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/override_ua_parameters.py

@@ -82,6 +82,6 @@ def test_override_ua_parameters(self):
                   'Waldo OS 6.0;'\
               'starboard_version=Starboard/12;'\
               'rasterizer_type=gles'
-          ]) as runner:
+          ], web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/persistent_cookie.py

@@ -35,22 +35,25 @@ def test_persistent_cookie(self):
       url = server.GetURL(file_name='testdata/persistent_cookie.html')
 
       # The webpage listens for NUMPAD1, NUMPAD2 and NUMPAD3 at opening.
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         # Press NUMPAD1 to verify basic cookie functionality and set
         # a persistent cookie.
         runner.WaitForJSTestsSetup()
         runner.SendKeys(keys.Keys.NUMPAD1)
         self.assertTrue(runner.JSTestsSucceeded())
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         # Press NUMPAD2 to indicate this is the second time we opened
         # the webpage and verify a persistent cookie is on device. Then
         # clear this persistent cookie.
         runner.SendKeys(keys.Keys.NUMPAD2)
         self.assertTrue(runner.JSTestsSucceeded())
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         # Press NUMPAD3 to verify the persistent cookie we cleared is
         # not on the device for this URL any more.

cobalt/black_box_tests/tests/pointer_test.py

@@ -48,7 +48,8 @@ def test_pointer_events(self):
           binding_address=self.GetBindingAddress()) as server:
         url = server.GetURL(file_name='testdata/pointer_test.html')
 
-        with self.CreateCobaltRunner(url=url) as runner:
+        with self.CreateCobaltRunner(
+            url=url, web_server_port=server.GetPort()) as runner:
           logging.info('JS Test Setup WaitForJSTestsSetup')
           runner.WaitForJSTestsSetup()
           logging.info('JS Test Setup')

cobalt/black_box_tests/tests/preload_font.py

@@ -34,14 +34,16 @@ def test_preload_font(self):
       url = server.GetURL(file_name='testdata/preload_font.html')
 
       with self.CreateCobaltRunner(
-          url=url, target_params=['--preload']) as runner:
+          url=url,
+          target_params=['--preload'],
+          web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         runner.SendResume()
         start_time = time.time()
         while runner.IsInPreload():
           if time.time() - start_time > _MAX_RESUME_WAIT_SECONDS:
-            raise Exception('Cobalt can not exit preload mode after receiving'
-                            'resume signal')
+            raise ValueError('Cobalt can not exit preload mode after receiving'
+                             ' resume signal')
           time.sleep(.1)
         # At this point, Cobalt is in started mode.
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/preload_launch_parameter.py

@@ -31,15 +31,19 @@ def test_preload_launch_parameter(self):
 
       # Test without other parameters.
       with self.CreateCobaltRunner(
-          url=url, target_params=['--preload']) as runner:
+          url=url,
+          target_params=['--preload'],
+          web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.IsInPreload())
         runner.SendResume()
         self.assertTrue(runner.JSTestsSucceeded())
 
       # Test with another parameter.
       with self.CreateCobaltRunner(
-          url=url + '?foo=bar', target_params=['--preload']) as runner:
+          url=url + '?foo=bar',
+          target_params=['--preload'],
+          web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.IsInPreload())
         runner.SendResume()

cobalt/black_box_tests/tests/preload_visibility.py

@@ -30,7 +30,9 @@ def test_preload_visibility(self):
       url = server.GetURL(file_name='testdata/preload_visibility.html')
 
       with self.CreateCobaltRunner(
-          url=url, target_params=['--preload']) as runner:
+          url=url,
+          target_params=['--preload'],
+          web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.IsInPreload())
         runner.SendResume()

cobalt/black_box_tests/tests/retry_async_script_loads_after_suspend.py

@@ -106,7 +106,8 @@ def test_retry_async_script_loads_after_suspend(self):
     try:
       with ThreadedWebServer(JavascriptRequestDetector,
                              self.GetBindingAddress()) as server:
-        with self.CreateCobaltRunner(url='about:blank') as runner:
+        with self.CreateCobaltRunner(
+            url='about:blank', web_server_port=server.GetPort()) as runner:
           target_url = server.GetURL(file_name='../testdata/' +
                                      _HTML_FILE_TO_REQUEST)
           cobalt_launcher_thread = threading.Thread(

cobalt/black_box_tests/tests/service_worker_add_to_cache_test.py

@@ -23,6 +23,7 @@ def test_service_worker_add_to_cache(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(
           file_name='testdata/service_worker_add_to_cache_test.html')
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/service_worker_cache_keys_test.py

@@ -23,6 +23,7 @@ def test_service_worker_cache_keys(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(
           file_name='testdata/service_worker_cache_keys_test.html')
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/service_worker_controller_activation_test.py

@@ -62,7 +62,8 @@ def test_service_worker_controller_activation(self):
       url = server.GetURL(
           file_name='testdata/service_worker_controller_activation_test.html')
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
 
         logging.info('SendKeys NUMPAD0.')

cobalt/black_box_tests/tests/service_worker_fetch_main_resource_test.py

@@ -23,6 +23,7 @@ def test_service_worker_fetch_main_resource(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(
           file_name='testdata/service_worker_fetch_main_resource_test.html')
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/service_worker_fetch_test.py

@@ -22,6 +22,7 @@ class ServiceWorkerFetchTest(black_box_tests.BlackBoxTestCase):
   def test_service_worker_fetch(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(file_name='testdata/service_worker_fetch_test.html')
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/service_worker_get_registrations_test.py

@@ -23,6 +23,7 @@ def test_service_worker_get_registrations(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(
           file_name='testdata/service_worker_get_registrations_test.html')
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/service_worker_message_test.py

@@ -25,6 +25,7 @@ def test_service_worker_message(self):
     with ThreadedWebServer(binding_address=self.GetBindingAddress()) as server:
       url = server.GetURL(file_name='testdata/service_worker_message_test.html')
 
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForJSTestsSetup()
         self.assertTrue(runner.JSTestsSucceeded())

cobalt/black_box_tests/tests/service_worker_persist_test.py

@@ -32,17 +32,20 @@ def test_service_worker_persist(self):
       url = server.GetURL(file_name='testdata/service_worker_persist_test.html')
 
       # NUMPAD0 calls test_successful_registration()
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForActiveElement()
         runner.SendKeys(keys.Keys.NUMPAD0)
         self.assertTrue(runner.JSTestsSucceeded())
       # NUMPAD1 calls test_persistent_registration()
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForActiveElement()
         runner.SendKeys(keys.Keys.NUMPAD1)
         self.assertTrue(runner.JSTestsSucceeded())
       # NUMPAD2 calls test_persistent_registration_does_not_exist()
-      with self.CreateCobaltRunner(url=url) as runner:
+      with self.CreateCobaltRunner(
+          url=url, web_server_port=server.GetPort()) as runner:
         runner.WaitForActiveElement()
         runner.SendKeys(keys.Keys.NUMPAD2)
         self.assertTrue(runner.JSTestsSucceeded())