summaryrefslogtreecommitdiff
path: root/test/appengine
diff options
context:
space:
mode:
authorJon Wayne Parrott <jonwayne@google.com>2017-06-08 09:01:49 -0700
committerJon Wayne Parrott <jonwayne@google.com>2017-06-08 09:01:49 -0700
commit39315237c009d6c18601449a48d5e096869f2a31 (patch)
tree4be8f322e80a8e6f07e55a686fd0f0f4a89699df /test/appengine
parent9c9947a00d9460ce17fce630b7a983d78c92fd31 (diff)
downloadurllib3-39315237c009d6c18601449a48d5e096869f2a31.tar.gz
Address review comments
Diffstat (limited to 'test/appengine')
-rw-r--r--test/appengine/conftest.py14
-rw-r--r--test/appengine/test_urlfetch.py6
2 files changed, 14 insertions, 6 deletions
diff --git a/test/appengine/conftest.py b/test/appengine/conftest.py
index aa9899ff..a0e3a046 100644
--- a/test/appengine/conftest.py
+++ b/test/appengine/conftest.py
@@ -19,13 +19,19 @@ import sys
from gcp_devrel.testing.appengine import (
pytest_configure,
pytest_runtest_call,
- testbed)
+ testbed
+)
import pytest
import six
-(pytest_configure)
-(pytest_runtest_call)
-(testbed)
+
+__all__ = [
+ 'pytest_configure',
+ 'pytest_runtest_call',
+ 'pytest_ignore_collect',
+ 'testbed',
+ 'sandbox',
+]
@pytest.fixture
diff --git a/test/appengine/test_urlfetch.py b/test/appengine/test_urlfetch.py
index cfc23614..9971d8e5 100644
--- a/test/appengine/test_urlfetch.py
+++ b/test/appengine/test_urlfetch.py
@@ -36,7 +36,8 @@ class TestHTTP(TestWithoutSSL):
'http://www.google.com',
{'content-type': 'text/plain'})
fetch_patch = patch(
- 'google.appengine.api.urlfetch.fetch', return_value=resp)
+ 'google.appengine.api.urlfetch.fetch', return_value=resp
+ )
with fetch_patch as fetch_mock:
import urllib3
pool = urllib3.HTTPConnectionPool('www.google.com', '80')
@@ -61,7 +62,8 @@ class TestHTTPS(unittest.TestCase):
'https://www.google.com',
{'content-type': 'text/plain'})
fetch_patch = patch(
- 'google.appengine.api.urlfetch.fetch', return_value=resp)
+ 'google.appengine.api.urlfetch.fetch', return_value=resp
+ )
with fetch_patch as fetch_mock:
import urllib3
pool = urllib3.HTTPSConnectionPool('www.google.com', '443')