Playback: Check outgoing traffic if it matches what is recorded in VCR tape + check if test source code changed + remove non-gzip vcr tape compat

tests/test_core.py

@@ -6,7 +6,7 @@
 import warnings
 
 from vcr import vcr, VCRSystem
-from vcr.utils import catch_stdout, skip_if_py2
+from vcr.utils import catch_stdout, skip_if_py2, _normalize_http_header
 
 try:
     # Py2
@@ -27,13 +27,16 @@ def setUp(self):
         self.path = os.path.join(os.path.dirname(__file__), 'vcrtapes')
         self.temp_test_vcr = os.path.join(self.path, 'test_core.temp_test.vcr')
         self.read_test_vcr = os.path.join(self.path, 'test_core.read_test.vcr')
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
 
     def tearDown(self):
         # cleanup temporary files
         try:
             os.remove(self.temp_test_vcr)
         except OSError:
             pass
+        VCRSystem.reset()
 
     def test_connectivity(self):
         # basic network connection test to exclude network issues
@@ -207,6 +210,8 @@ def setUp(self):
         self.path = os.path.join(os.path.dirname(__file__), 'vcrtapes')
         self.temp_test_vcr = os.path.join(self.path, 'test_core.temp_test.vcr')
         self.read_test_vcr = os.path.join(self.path, 'test_core.read_test.vcr')
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
 
     def tearDown(self):
         # cleanup temporary files
@@ -238,6 +243,10 @@ def read_test():
 
         # reset
         VCRSystem.reset()
+        # due to the reset we have to put http header normalizations in place
+        # again which is done in test case setUp()
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
         # re-run the test - again no output
         with catch_stdout() as out:
             read_test()
@@ -271,6 +280,10 @@ def temp_test():
 
         # reset
         VCRSystem.reset()
+        # due to the reset we have to put http header normalizations in place
+        # again which is done in test case setUp()
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
         # get current mtime
         mtime = os.path.getmtime(self.temp_test_vcr)
         # run it again
@@ -299,6 +312,10 @@ def read_test():
 
         # reset
         VCRSystem.reset()
+        # due to the reset we have to put http header normalizations in place
+        # again which is done in test case setUp()
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
         # re-run the test - again output due to debug mode on decorator level
         with catch_stdout() as out:
             read_test()
@@ -328,6 +345,10 @@ def temp_test():
 
         # reset
         VCRSystem.reset()
+        # due to the reset we have to put http header normalizations in place
+        # again which is done in test case setUp()
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
         # re-run the test - now record mode without exception
         with catch_stdout() as out:
             temp_test()

tests/test_doctest.py

@@ -6,13 +6,20 @@
 
 import requests
 
-from vcr import vcr
+from vcr import vcr, VCRSystem
+from vcr.utils import _normalize_http_header
 
 
 # monkey patch DocTestCase
 def runTest(self):  # NOQA
     if '+VCR' in self._dt_test.docstring:
-        return vcr(self._runTest)()
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
+        try:
+            ret = vcr(self._runTest)()
+        finally:
+            VCRSystem.outgoing_check_normalizations = []
+        return ret
     return self._runTest()
 
 

tests/test_http_client.py

@@ -3,7 +3,8 @@
 
 import unittest
 
-from vcr import vcr
+from vcr import vcr, VCRSystem
+from vcr.utils import _normalize_http_header
 
 try:
     # Py3
@@ -15,10 +16,17 @@
     from httplib import HTTPConnection, HTTPSConnection
 
 
-class RequestsTestCase(unittest.TestCase):
+class HTTPClientTestCase(unittest.TestCase):
     """
     Test suite using requests
     """
+    def setUp(self):
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
+
+    def tearDown(self):
+        VCRSystem.reset()
+
     def test_connectivity(self):
         # basic network connection test to exclude network issues
         conn = HTTPSConnection("www.python.org")
@@ -79,8 +87,8 @@ def test_redirect_to_https(self):
 
     @vcr
     def test_http_post(self):
-        params = urlencode({'@number': 12524, '@type': 'issue',
-                            '@action': 'show'})
+        params = urlencode([('@number', 12524), ('@type', 'issue'),
+                            ('@action', 'show')])
         headers = {"Content-type": "application/x-www-form-urlencoded",
                    "Accept": "text/plain"}
         conn = HTTPConnection("bugs.python.org")

tests/test_requests.py

@@ -7,13 +7,21 @@
 
 import requests
 
-from vcr import vcr
+from vcr import vcr, VCRSystem
+from vcr.utils import _normalize_http_header
 
 
 class RequestsTestCase(unittest.TestCase):
     """
     Test suite using requests
     """
+    def setUp(self):
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
+
+    def tearDown(self):
+        VCRSystem.reset()
+
     def test_connectivity(self):
         # basic network connection test to exclude network issues
         r = requests.get('https://www.python.org/')
@@ -26,20 +34,27 @@ def test_http_get(self):
 
     @vcr
     def test_http_post(self):
-        payload = dict(key1='value1', key2='value2')
+        # order of body items can be controlled by using a list of tuples as
+        # opposed to a dictionary
+        payload = [('key1', 'value1'), ('key2', 'value2')]
         r = requests.post('http://httpbin.org/post', data=payload)
         out = json.loads(r.text)
         self.assertEqual(out['form'], {'key1': 'value1', 'key2': 'value2'})
 
     @vcr
     def test_http_post_file(self):
-        with tempfile.TemporaryFile(mode='wb+') as file:
-            file.write(b'test123')
-            file.seek(0)
-            files = {'file': file}
-            r = requests.post('http://httpbin.org/post', files=files)
-        out = json.loads(r.text)
-        self.assertEqual(out['files']['file'], 'test123')
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
+        try:
+            with tempfile.TemporaryFile(mode='wb+') as file:
+                file.write(b'test123')
+                file.seek(0)
+                files = {'file': file}
+                r = requests.post('http://httpbin.org/post', files=files)
+            out = json.loads(r.text)
+            self.assertEqual(out['files']['file'], 'test123')
+        finally:
+            VCRSystem.outgoing_check_normalizations = []
 
     @vcr
     def test_cookies(self):

tests/test_xmlrpc.py

@@ -3,7 +3,8 @@
 
 import unittest
 
-from vcr import vcr
+from vcr import vcr, VCRSystem
+from vcr.utils import _normalize_http_header
 
 
 try:
@@ -18,6 +19,14 @@ class XMLRPCTestCase(unittest.TestCase):
     """
     Test suite using xmlrpc
     """
+    def setUp(self):
+        VCRSystem.outgoing_check_normalizations = [
+            _normalize_http_header]
+
+    def tearDown(self):
+        # reset to default settings
+        VCRSystem.reset()
+
     @vcr
     def test_serverproxy(self):
         server = ServerProxy("http://betty.userland.com")

vcr/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from .core import vcr, VCRSystem
+from .core import vcr, VCRSystem, VCRException