holm/httpie-cli
1
1
Fork 0
forked from extern/httpie-cli
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing tests for Travis.

Browse Source
This commit is contained in:
Jakub Roztocil 2013-01-04 03:05:36 +01:00
parent a93d57b58b
commit 238b2e0441
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
httpie/sessions.py
View File

@ -37,7 +37,6 @@ def get_response(name, request_kwargs, config_dir, read_only=False):
session = Session(host, name) session = Session(host, name)
session.load() session.load()
# Update session headers with the request headers. # Update session headers with the request headers.
session['headers'].update(request_kwargs.get('headers', {})) session['headers'].update(request_kwargs.get('headers', {}))
# Use the merged headers for the request # Use the merged headers for the request

3
tests/tests.py
View File

@ -1403,6 +1403,9 @@ class SessionTest(BaseTestCase):
) )
self.assertIn(OK, r3) self.assertIn(OK, r3)
# Origin can differ on Travis.
del r1.json['headers']['origin'], r2.json['headers']['origin']
# Should be the same as before r2. # Should be the same as before r2.
self.assertDictEqual(r1.json, r3.json) self.assertDictEqual(r1.json, r3.json)