Skip to content

Commit

Permalink
Don't call external URLs from tests #729
Browse files Browse the repository at this point in the history
  • Loading branch information
jkbrzt committed Nov 14, 2018
1 parent 74979f3 commit f6a19cf
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ This document records all notable changes to `HTTPie <http://httpie.org>`_.
This project adheres to `Semantic Versioning <http://semver.org/>`_.


`1.0.1`_ (2018-11-14)
-------------------------

* Removed external URL calls from tests.


`1.0.0`_ (2018-11-02)
-------------------------

Expand Down
2 changes: 1 addition & 1 deletion httpie/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
HTTPie - a CLI, cURL-like tool for humans.
"""
__version__ = '1.0.0'
__version__ = '1.0.1'
__author__ = 'Jakub Roztocil'
__licence__ = 'BSD'

Expand Down
27 changes: 11 additions & 16 deletions tests/test_binary.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Tests for dealing with binary request and response data."""
import requests

from fixtures import BIN_FILE_PATH, BIN_FILE_CONTENT, BIN_FILE_PATH_ARG
from httpie.compat import urlopen
from httpie.output.streams import BINARY_SUPPRESSED_NOTICE
from utils import MockEnvironment, http

Expand Down Expand Up @@ -31,25 +32,19 @@ def test_binary_file_form(self, httpbin):


class TestBinaryResponseData:
url = 'http://www.google.com/favicon.ico'

@property
def bindata(self):
if not hasattr(self, '_bindata'):
self._bindata = urlopen(self.url).read()
return self._bindata

def test_binary_suppresses_when_terminal(self):
r = http('GET', self.url)
def test_binary_suppresses_when_terminal(self, httpbin):
r = http('GET', httpbin + '/bytes/1024')
assert BINARY_SUPPRESSED_NOTICE.decode() in r

def test_binary_suppresses_when_not_terminal_but_pretty(self):
def test_binary_suppresses_when_not_terminal_but_pretty(self, httpbin):
env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
r = http('--pretty=all', 'GET', self.url,
env=env)
r = http('--pretty=all', 'GET', httpbin + '/bytes/1024', env=env)
assert BINARY_SUPPRESSED_NOTICE.decode() in r

def test_binary_included_and_correct_when_suitable(self):
def test_binary_included_and_correct_when_suitable(self, httpbin):
env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
r = http('GET', self.url, env=env)
assert r == self.bindata
url = httpbin + '/bytes/1024?seed=1'
r = http('GET', url, env=env)
expected = requests.get(url).content
assert r == expected

0 comments on commit f6a19cf

Please sign in to comment.