This commit is contained in:
Jakub Roztocil 2016-11-24 00:58:41 +01:00
parent 2bf71af286
commit 2efc0db8d4
3 changed files with 8 additions and 7 deletions

View File

@ -3,18 +3,14 @@
NOTE: the CLI interface may change before reaching v1.0. NOTE: the CLI interface may change before reaching v1.0.
""" """
from textwrap import dedent, wrap
# noinspection PyCompatibility # noinspection PyCompatibility
from argparse import ( from argparse import (
RawDescriptionHelpFormatter, FileType, RawDescriptionHelpFormatter, FileType,
OPTIONAL, ZERO_OR_MORE, SUPPRESS OPTIONAL, ZERO_OR_MORE, SUPPRESS
) )
from textwrap import dedent, wrap
from httpie import __doc__, __version__ from httpie import __doc__, __version__
from httpie.plugins.builtin import BuiltinAuthPlugin
from httpie.plugins import plugin_manager
from httpie.sessions import DEFAULT_SESSIONS_DIR
from httpie.output.formatters.colors import AVAILABLE_STYLES, DEFAULT_STYLE
from httpie.input import ( from httpie.input import (
HTTPieArgumentParser, KeyValueArgType, HTTPieArgumentParser, KeyValueArgType,
SEP_PROXY, SEP_GROUP_ALL_ITEMS, SEP_PROXY, SEP_GROUP_ALL_ITEMS,
@ -24,6 +20,10 @@ from httpie.input import (
PRETTY_STDOUT_TTY_ONLY, SessionNameValidator, PRETTY_STDOUT_TTY_ONLY, SessionNameValidator,
readable_file_arg, SSL_VERSION_ARG_MAPPING readable_file_arg, SSL_VERSION_ARG_MAPPING
) )
from httpie.output.formatters.colors import AVAILABLE_STYLES, DEFAULT_STYLE
from httpie.plugins import plugin_manager
from httpie.plugins.builtin import BuiltinAuthPlugin
from httpie.sessions import DEFAULT_SESSIONS_DIR
class HTTPieHelpFormatter(RawDescriptionHelpFormatter): class HTTPieHelpFormatter(RawDescriptionHelpFormatter):

View File

@ -1,14 +1,15 @@
from mock import mock from mock import mock
from utils import http, HTTP_OK
from httpie.input import SEP_CREDENTIALS from httpie.input import SEP_CREDENTIALS
from httpie.plugins import AuthPlugin, plugin_manager from httpie.plugins import AuthPlugin, plugin_manager
from utils import http, HTTP_OK
# TODO: run all these tests in session mode as well # TODO: run all these tests in session mode as well
USERNAME = 'user' USERNAME = 'user'
PASSWORD = 'password' PASSWORD = 'password'
# Basic auth encoded `USERNAME` and `PASSWORD` # Basic auth encoded `USERNAME` and `PASSWORD`
# noinspection SpellCheckingInspection
BASIC_AUTH_HEADER_VALUE = 'Basic dXNlcjpwYXNzd29yZA==' BASIC_AUTH_HEADER_VALUE = 'Basic dXNlcjpwYXNzd29yZA=='
BASIC_AUTH_URL = '/basic-auth/{0}/{1}'.format(USERNAME, PASSWORD) BASIC_AUTH_URL = '/basic-auth/{0}/{1}'.format(USERNAME, PASSWORD)
AUTH_OK = {'authenticated': True, 'user': USERNAME} AUTH_OK = {'authenticated': True, 'user': USERNAME}

View File

@ -1,8 +1,8 @@
"""Tests for dealing with binary request and response data.""" """Tests for dealing with binary request and response data."""
from fixtures import BIN_FILE_PATH, BIN_FILE_CONTENT, BIN_FILE_PATH_ARG
from httpie.compat import urlopen from httpie.compat import urlopen
from httpie.output.streams import BINARY_SUPPRESSED_NOTICE from httpie.output.streams import BINARY_SUPPRESSED_NOTICE
from utils import TestEnvironment, http from utils import TestEnvironment, http
from fixtures import BIN_FILE_PATH, BIN_FILE_CONTENT, BIN_FILE_PATH_ARG
class TestBinaryRequestData: class TestBinaryRequestData: