diff options
| author | Haibo Huang <hhb@google.com> | 2019-10-01 21:57:01 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-01 21:57:01 -0700 |
| commit | 444252d6aeeaf404971941d4e4f837432e1e6b52 (patch) | |
| tree | 3ed7928f67b78d15fde5300b5e2f203abe05f2ee /tests/__init__.py | |
| parent | 534a227325dc3dff5ea339cf464034ff1840f848 (diff) | |
| parent | ad6153f520dcca2e47173a870f3ae82f51f2d187 (diff) | |
| download | httplib2-444252d6aeeaf404971941d4e4f837432e1e6b52.tar.gz | |
Upgrade python/httplib2 to v0.14.0 am: b651919b56
am: ad6153f520
Change-Id: I44b26d4429526b853af15f161059dfdedfccdcad
Diffstat (limited to 'tests/__init__.py')
| -rw-r--r-- | tests/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/__init__.py b/tests/__init__.py index 69d7d10..28959d3 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -269,7 +269,8 @@ def server_socket(fun, request_count=1, timeout=5): gcounter[0] += 1 keep = True keep &= gcounter[0] < request_count - keep &= request.headers.get("connection", "").lower() != "close" + if request is not None: + keep &= request.headers.get("connection", "").lower() != "close" return keep def server_socket_thread(srv): @@ -295,7 +296,7 @@ def server_socket(fun, request_count=1, timeout=5): ) except Exception as e: # traceback.print_exc caused IOError: concurrent operation on sys.stderr.close() under setup.py test - sys.stderr.write(traceback.format_exc().encode()) + print(traceback.format_exc(), file=sys.stderr) gresult[0] = e server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) |