python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2024-11-28 08:38:44 +02:00
Code

Fixed tests.

Browse Source
This commit is contained in:
Jakub Roztocil 2014-06-03 19:44:22 +02:00
parent b44bc0928f
commit 8e170b059c
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
httpie/core.py
View File

@ -61,7 +61,8 @@ def decode_args(args, stdin_encoding):
""" """
return [ return [
arg.decode(stdin_encoding) if type(arg) == bytes else arg arg.decode(stdin_encoding)
if type(arg) == bytes else arg
for arg in args for arg in args
] ]
@ -72,10 +73,11 @@ def main(args=sys.argv[1:], env=Environment()):
Return exit status code. Return exit status code.
""" """
from httpie.cli import parser args = decode_args(args, env.stdin_encoding)
plugin_manager.load_installed_plugins() plugin_manager.load_installed_plugins()
from httpie.cli import parser
if env.config.default_options: if env.config.default_options:
args = env.config.default_options + args args = env.config.default_options + args

6
tests/test_sessions.py
View File

@ -132,11 +132,13 @@ class TestSession(SessionTestBase):
env=self.env()) env=self.env())
assert HTTP_OK in r1 assert HTTP_OK in r1
r2 = http('--session=test', 'GET', httpbin('/get'), env=self.env()) r2 = http('--session=test', '--verbose', 'GET',
httpbin('/get'), env=self.env())
assert HTTP_OK in r2 assert HTTP_OK in r2
assert (r2.json['headers']['Authorization'] assert (r2.json['headers']['Authorization']
== HTTPBasicAuth.make_header(u'test', UNICODE)) == HTTPBasicAuth.make_header(u'test', UNICODE))
assert r2.json['headers']['Test'] == UNICODE # httpbin doesn't interpret utf8 headers
assert UNICODE in r2
def test_session_default_header_value_overwritten(self): def test_session_default_header_value_overwritten(self):
# https://github.com/jakubroztocil/httpie/issues/180 # https://github.com/jakubroztocil/httpie/issues/180

3
tests/test_unicode.py
View File

@ -10,11 +10,12 @@ from fixtures import UNICODE
class TestUnicode: class TestUnicode:
def test_unicode_headers(self): def test_unicode_headers(self):
# httpbin doesn't interpret utf8 headers
r = http(httpbin('/headers'), u'Test:%s' % UNICODE) r = http(httpbin('/headers'), u'Test:%s' % UNICODE)
assert HTTP_OK in r assert HTTP_OK in r
assert r.json['headers']['Test'] == UNICODE
def test_unicode_headers_verbose(self): def test_unicode_headers_verbose(self):
# httpbin doesn't interpret utf8 headers
r = http('--verbose', httpbin('/headers'), u'Test:%s' % UNICODE) r = http('--verbose', httpbin('/headers'), u'Test:%s' % UNICODE)
assert HTTP_OK in r assert HTTP_OK in r
assert UNICODE in r assert UNICODE in r