proxy: switching not available for ip resolver either

tests: update tests for auth and ip resolver to check that proxy magic is not set

Author: ikreymer

pywb/framework/proxy_resolvers.py

@@ -123,7 +123,7 @@ def __init__(self, routes, config):
 
     @property
     def supports_switching(self):
-        return True
+        return False
 
     def _get_ip(self, env):
         ip = env['REMOTE_ADDR']

tests/test_proxy_http_auth.py

@@ -22,14 +22,16 @@ def _assert_basic_text(self, resp):
         assert resp.content_type == 'text/plain'
         assert resp.content_length > 0
 
+        assert 'proxy_magic = ""' in resp.body
+        assert 'wb.js' in resp.body
+
     # 'Simulating' proxy by settings REQUEST_URI explicitly to http:// url and no SCRIPT_NAME
     # would be nice to be able to test proxy more
     def test_proxy_replay(self):
         resp = self.testapp.get('/x-ignore-this-x', extra_environ = dict(REQUEST_URI = 'http://www.iana.org/domains/idn-tables', SCRIPT_NAME = ''))
         self._assert_basic_html(resp)
 
         assert '"20140126201127"' in resp.body
-        assert 'wb.js' in resp.body
 
     def test_proxy_replay_auth_filtered(self):
         headers = [('Proxy-Authorization', 'Basic ' + base64.b64encode('pywb-filt-2:'))]
@@ -39,7 +41,6 @@ def test_proxy_replay_auth_filtered(self):
         self._assert_basic_html(resp)
 
         assert '"20140126200624"' in resp.body
-        assert 'wb.js' in resp.body
 
     def test_proxy_replay_auth(self):
         headers = [('Proxy-Authorization', 'Basic ' + base64.b64encode('pywb'))]
@@ -49,7 +50,6 @@ def test_proxy_replay_auth(self):
         self._assert_basic_html(resp)
 
         assert '"20140127171238"' in resp.body
-        assert 'wb.js' in resp.body
 
     def test_proxy_replay_auth_no_coll(self):
         headers = [('Proxy-Authorization', 'Basic ' + base64.b64encode('no-such-coll'))]

tests/test_proxy_http_ip.py

@@ -18,6 +18,7 @@ def _assert_basic_html(self, resp):
         assert resp.status_int == 200
         assert resp.content_type == 'text/html'
         assert resp.content_length > 0
+        assert 'proxy_magic = ""' in resp.body
 
     def _assert_basic_text(self, resp):
         assert resp.status_int == 200