From: Stephen Huenneke <stephen.huenneke@gmail.com>
Date: Thu, 8 Aug 2013 15:48:42 +0000 (-0700)
Subject: Fixing tests to verify thrown ValueError's.
X-Git-Tag: v2.0~6^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b676bf3214fa917f20542b9d3d31577b47a73cc1;p=services%2Fpython-requests.git

Fixing tests to verify thrown ValueError's.
---

diff --git a/test_requests.py b/test_requests.py
index 01e1780..40daaf9 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -10,6 +10,7 @@ import unittest
 import pickle
 
 import requests
+import pytest
 from requests.auth import HTTPDigestAuth
 from requests.adapters import HTTPAdapter
 from requests.compat import str, cookielib, getproxies, urljoin
@@ -357,11 +358,11 @@ class RequestsTestCase(unittest.TestCase):
         except ValueError:
             pass
 
+    def test_conflicting_post_params(self):
+        url = httpbin('post')
         with open('requirements.txt') as f:
-            try:
-                requests.post(url, data='[{"some": "data"}]', files={'some': f})
-            except ValueError:
-                pass
+            pytest.raises(ValueError, "requests.post(url, data='[{\"some\": \"data\"}]', files={'some': f})")
+            pytest.raises(ValueError, "requests.post(url, data=u'[{\"some\": \"data\"}]', files={'some': f})")
 
     def test_request_ok_set(self):
         r = requests.get(httpbin('status', '404'))