Merge branch 'release/0.2.3'v0.2.3

1 files changed, 27 insertions, 1 deletions

diff --git a/test_requests.py b/test_requests.py
index 35bb9f65..2fda7ee8 100644
--- a/test_requests.py
+++ b/test_requests.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-
 import unittest
 from cStringIO import StringIO
 
@@ -21,22 +20,27 @@ class RequestsTestSuite(unittest.TestCase):
 	def test_invalid_url(self):
 		self.assertRaises(ValueError, requests.get, 'hiwpefhipowhefopw')
 
+
 	def test_HTTP_200_OK_GET(self):
 		r = requests.get('http://google.com')
 		self.assertEqual(r.status_code, 200)
 
+
 	def test_HTTPS_200_OK_GET(self):
 		r = requests.get('https://google.com')
 		self.assertEqual(r.status_code, 200)
 
+
 	def test_HTTP_200_OK_HEAD(self):
 		r = requests.head('http://google.com')
 		self.assertEqual(r.status_code, 200)
 
+
 	def test_HTTPS_200_OK_HEAD(self):
 		r = requests.head('https://google.com')
 		self.assertEqual(r.status_code, 200)
 
+
 	def test_AUTH_HTTPS_200_OK_GET(self):
 		auth = requests.AuthObject('requeststest', 'requeststest')
 		url = 'https://convore.com/api/account/verify.json'
@@ -44,6 +48,7 @@ class RequestsTestSuite(unittest.TestCase):
 
 		self.assertEqual(r.status_code, 200)
 
+
 	def test_POSTBIN_GET_POST_FILES(self):
 
 		bin = requests.post('http://www.postbin.org/')
@@ -56,6 +61,27 @@ class RequestsTestSuite(unittest.TestCase):
 		self.assertEqual(post2.status_code, 201)
 
 
+	def test_nonzero_evaluation(self):
+		r = requests.get('http://google.com/some-404-url')
+		self.assertEqual(bool(r), False)
+	
+		r = requests.get('http://google.com/')
+		self.assertEqual(bool(r), True)
+
+
+	def test_request_ok_set(self):
+		r = requests.get('http://google.com/some-404-url')
+		self.assertEqual(r.ok, False)
+
+
+	def test_status_raising(self):
+		r = requests.get('http://google.com/some-404-url')
+		self.assertRaises(requests.HTTPError, r.raise_for_status)
+
+		r = requests.get('http://google.com/')
+		self.assertFalse(r.error)
+		r.raise_for_status()
+
 
 if __name__ == '__main__':
 	unittest.main()