Reenabling timeout tests as they have been fixed in B6 of the server

Author: AutomatedTester

.travis.yml

@@ -7,9 +7,9 @@ python:
   - 3.4
   - 3.5
 before_script:
-  - curl -l -L -O https://github.com/lightbody/browsermob-proxy/releases/download/browsermob-proxy-2.1.0-beta-5/browsermob-proxy-2.1.0-beta-5-bin.zip
-  - unzip browsermob-proxy-2.1.0-beta-5-bin.zip
-  - sh browsermob-proxy-2.1.0-beta-5/bin/browsermob-proxy --port=9090 &
+  - curl -l -L -O https://github.com/lightbody/browsermob-proxy/releases/download/browsermob-proxy-2.1.0-beta-6/browsermob-proxy-2.1.0-beta-6-bin.zip
+  - unzip browsermob-proxy-2.1.0-beta-6-bin.zip
+  - sh browsermob-proxy-2.1.0-beta-6/bin/browsermob-proxy --port=9090 &
   - sleep 5
 install: pip install pytest selenium
 script: python setup.py develop && py.test -m "not human" test

test/test_client.py

@@ -212,7 +212,6 @@ def test_timeouts_key_no_value(self):
         with pytest.raises(KeyError):
             self.client.timeouts({})
 
-    @pytest.mark.xfail(reason="see https://github.com/lightbody/browsermob-proxy/issues/414")
     def test_timeouts_all_key_values(self):
         """
         /proxy/:port/timeout