Merge pull request #432 from hangtwenty/master

Add `-A` as short arg for `--auth-type`
This commit is contained in:
Jakub Roztočil 2016-02-28 20:58:23 +08:00
commit 25f0156502
2 changed files with 4 additions and 3 deletions

View File

@ -400,7 +400,7 @@ auth.add_argument(
_auth_plugins = plugin_manager.get_auth_plugins() _auth_plugins = plugin_manager.get_auth_plugins()
auth.add_argument( auth.add_argument(
'--auth-type', '--auth-type', '-A',
choices=[plugin.auth_type for plugin in _auth_plugins], choices=[plugin.auth_type for plugin in _auth_plugins],
default=_auth_plugins[0].auth_type, default=_auth_plugins[0].auth_type,
help=""" help="""

View File

@ -14,11 +14,12 @@ class TestAuth:
assert HTTP_OK in r assert HTTP_OK in r
assert r.json == {'authenticated': True, 'user': 'user'} assert r.json == {'authenticated': True, 'user': 'user'}
@pytest.mark.parametrize('argument_name', ['--auth-type', '-A'])
@pytest.mark.skipif( @pytest.mark.skipif(
requests.__version__ == '0.13.6', requests.__version__ == '0.13.6',
reason='Redirects with prefetch=False are broken in Requests 0.13.6') reason='Redirects with prefetch=False are broken in Requests 0.13.6')
def test_digest_auth(self, httpbin): def test_digest_auth(self, httpbin, argument_name):
r = http('--auth-type=digest', '--auth=user:password', r = http(argument_name + '=digest', '--auth=user:password',
'GET', httpbin.url + '/digest-auth/auth/user/password') 'GET', httpbin.url + '/digest-auth/auth/user/password')
assert HTTP_OK in r assert HTTP_OK in r
assert r.json == {'authenticated': True, 'user': 'user'} assert r.json == {'authenticated': True, 'user': 'user'}