restore support for on_response and on_request, with an automated test for on_response

tests/test_brozzling.py

@@ -19,9 +19,71 @@ limitations under the License.
 
 import pytest
 import brozzler
+import logging
+import os
+import http.server
+import threading
+import argparse
+
+args = argparse.Namespace()
+args.log_level = logging.INFO
+brozzler.cli._configure_logging(args)
+
+@pytest.fixture(scope='module')
+def httpd(request):
+    # SimpleHTTPRequestHandler always uses CWD so we have to chdir
+    os.chdir(os.path.join(os.path.dirname(__file__), 'htdocs'))
+
+    httpd = http.server.HTTPServer(
+            ('localhost', 0), http.server.SimpleHTTPRequestHandler)
+    httpd_thread = threading.Thread(name='httpd', target=httpd.serve_forever)
+    httpd_thread.start()
+
+    def fin():
+        httpd.shutdown()
+        httpd.server_close()
+        httpd_thread.join()
+    request.addfinalizer(fin)
+
+    return httpd
+
+def test_httpd(httpd):
+    '''
+    Tests that our http server is working as expected, and that two fetches
+    of the same url return the same payload, proving it can be used to test
+    deduplication.
+    '''
+    payload1 = content2 = None
+    url = 'http://localhost:%s/site1/file1.txt' % httpd.server_port
+    with urllib.request.urlopen(url) as response:
+        assert response.status == 200
+        payload1 = response.read()
+        assert payload1
+
+    with urllib.request.urlopen(url) as response:
+        assert response.status == 200
+        payload2 = response.read()
+        assert payload2
+
+    assert payload1 == payload2
 
 def test_aw_snap_hes_dead_jim():
     chrome_exe = brozzler.suggest_default_chrome_exe()
     with brozzler.Browser(chrome_exe=chrome_exe) as browser:
         with pytest.raises(brozzler.BrowsingException):
             browser.browse_page('chrome://crash')
+
+def test_on_response(httpd):
+    response_urls = []
+    def on_response(msg):
+        response_urls.append(msg['params']['response']['url'])
+
+    chrome_exe = brozzler.suggest_default_chrome_exe()
+    url = 'http://localhost:%s/site3/page.html' % httpd.server_port
+    with brozzler.Browser(chrome_exe=chrome_exe) as browser:
+        browser.browse_page(url, on_response=on_response)
+        browser.browse_page(url)
+    assert response_urls[0] == 'http://localhost:%s/site3/page.html' % httpd.server_port
+    assert response_urls[1] == 'http://localhost:%s/site3/brozzler.svg' % httpd.server_port
+    assert response_urls[2] == 'http://localhost:%s/favicon.ico' % httpd.server_port
+