|
 |
b18fa3 |
From 9b63f9cd37d19f2d4bbce42caec112ad0606d8dd Mon Sep 17 00:00:00 2001
|
|
|
b18fa3 |
From: Cory Benfield <lukasaoz@gmail.com>
|
|
|
b18fa3 |
Date: Thu, 22 Oct 2015 12:22:28 +0100
|
|
|
b18fa3 |
Subject: [PATCH] Make sure we unapply this patch.
|
|
|
b18fa3 |
|
|
|
b18fa3 |
---
|
|
|
b18fa3 |
test_requests.py | 47 ++++++++++++++++++++++++++---------------------
|
|
|
b18fa3 |
1 file changed, 26 insertions(+), 21 deletions(-)
|
|
|
b18fa3 |
|
|
|
b18fa3 |
diff --git a/test_requests.py b/test_requests.py
|
|
|
b18fa3 |
index d1c6aa4d5..cb25555aa 100755
|
|
|
b18fa3 |
--- a/test_requests.py
|
|
|
b18fa3 |
+++ b/test_requests.py
|
|
|
b18fa3 |
@@ -353,28 +353,33 @@ def test_basicauth_with_netrc(self):
|
|
|
b18fa3 |
wrong_auth = ('wronguser', 'wrongpass')
|
|
|
b18fa3 |
url = httpbin('basic-auth', 'user', 'pass')
|
|
|
b18fa3 |
|
|
|
b18fa3 |
- def get_netrc_auth_mock(url):
|
|
|
b18fa3 |
- return auth
|
|
|
b18fa3 |
- requests.sessions.get_netrc_auth = get_netrc_auth_mock
|
|
|
b18fa3 |
+ old_auth = requests.sessions.get_netrc_auth
|
|
|
b18fa3 |
|
|
|
b18fa3 |
- # Should use netrc and work.
|
|
|
b18fa3 |
- r = requests.get(url)
|
|
|
b18fa3 |
- assert r.status_code == 200
|
|
|
b18fa3 |
-
|
|
|
b18fa3 |
- # Given auth should override and fail.
|
|
|
b18fa3 |
- r = requests.get(url, auth=wrong_auth)
|
|
|
b18fa3 |
- assert r.status_code == 401
|
|
|
b18fa3 |
-
|
|
|
b18fa3 |
- s = requests.session()
|
|
|
b18fa3 |
-
|
|
|
b18fa3 |
- # Should use netrc and work.
|
|
|
b18fa3 |
- r = s.get(url)
|
|
|
b18fa3 |
- assert r.status_code == 200
|
|
|
b18fa3 |
-
|
|
|
b18fa3 |
- # Given auth should override and fail.
|
|
|
b18fa3 |
- s.auth = wrong_auth
|
|
|
b18fa3 |
- r = s.get(url)
|
|
|
b18fa3 |
- assert r.status_code == 401
|
|
|
b18fa3 |
+ try:
|
|
|
b18fa3 |
+ def get_netrc_auth_mock(url):
|
|
|
b18fa3 |
+ return auth
|
|
|
b18fa3 |
+ requests.sessions.get_netrc_auth = get_netrc_auth_mock
|
|
|
b18fa3 |
+
|
|
|
b18fa3 |
+ # Should use netrc and work.
|
|
|
b18fa3 |
+ r = requests.get(url)
|
|
|
b18fa3 |
+ assert r.status_code == 200
|
|
|
b18fa3 |
+
|
|
|
b18fa3 |
+ # Given auth should override and fail.
|
|
|
b18fa3 |
+ r = requests.get(url, auth=wrong_auth)
|
|
|
b18fa3 |
+ assert r.status_code == 401
|
|
|
b18fa3 |
+
|
|
|
b18fa3 |
+ s = requests.session()
|
|
|
b18fa3 |
+
|
|
|
b18fa3 |
+ # Should use netrc and work.
|
|
|
b18fa3 |
+ r = s.get(url)
|
|
|
b18fa3 |
+ assert r.status_code == 200
|
|
|
b18fa3 |
+
|
|
|
b18fa3 |
+ # Given auth should override and fail.
|
|
|
b18fa3 |
+ s.auth = wrong_auth
|
|
|
b18fa3 |
+ r = s.get(url)
|
|
|
b18fa3 |
+ assert r.status_code == 401
|
|
|
b18fa3 |
+ finally:
|
|
|
b18fa3 |
+ requests.sessions.get_netrc_auth = old_auth
|
|
|
b18fa3 |
|
|
|
b18fa3 |
def test_DIGEST_HTTP_200_OK_GET(self):
|
|
|
b18fa3 |
|