Rev 3125: Fix test leakage. in file:///v/home/vila/src/bzr/bugs/175524/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/175524/

------------------------------------------------------------
revno: 3125
revision-id:v.ladeuil+lp at free.fr-20071220201638-dcvzegapib1wkdga
parent: v.ladeuil+lp at free.fr-20071220195456-kcfeaesoblw6h0hm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2007-12-20 21:16:38 +0100
message:
  Fix test leakage.
  
  * bzrlib/tests/test_http.py:
  (TestHttps_pycurl.test_pycurl_without_https_support): Restore
  pycurl.version_info after the test.
modified:
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
-------------- next part --------------
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2007-12-20 16:36:44 +0000
+++ b/bzrlib/tests/test_http.py	2007-12-20 20:16:38 +0000
@@ -171,24 +171,30 @@
             import pycurl
         except ImportError:
             raise tests.TestSkipped('pycurl not present')
-        # Now that we have pycurl imported, we can fake its version_info
-        # This was taken from a windows pycurl without SSL
-        # (thanks to bialix)
-        pycurl.version_info = lambda : (2,
-                                        '7.13.2',
-                                        462082,
-                                        'i386-pc-win32',
-                                        2576,
-                                        None,
-                                        0,
-                                        None,
-                                        ('ftp', 'gopher', 'telnet',
-                                         'dict', 'ldap', 'http', 'file'),
-                                        None,
-                                        0,
-                                        None)
-        self.assertRaises(errors.DependencyNotPresent, self._transport,
-                          'https://launchpad.net')
+
+        version_info_orig = pycurl.version_info
+        try:
+            # Now that we have pycurl imported, we can fake its version_info
+            # This was taken from a windows pycurl without SSL
+            # (thanks to bialix)
+            pycurl.version_info = lambda : (2,
+                                            '7.13.2',
+                                            462082,
+                                            'i386-pc-win32',
+                                            2576,
+                                            None,
+                                            0,
+                                            None,
+                                            ('ftp', 'gopher', 'telnet',
+                                             'dict', 'ldap', 'http', 'file'),
+                                            None,
+                                            0,
+                                            None)
+            self.assertRaises(errors.DependencyNotPresent, self._transport,
+                              'https://launchpad.net')
+        finally:
+            # Restore the right function
+            pycurl.version_info = version_info_orig
 
 class TestRangeHeader(tests.TestCase):
     """Test range_header method"""