X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Fuse-packaged-python-mock-rather-than-embedded.patch;h=12a3bad092e967c08bfc128ce115018d81028c6f;hb=refs%2Fheads%2Fmaster;hp=2bbc30119bde572c6f8649d4c303a7a5dae01768;hpb=376ff3bfe7071cc0793184a378c4e74508fb0d97;p=packages%2Ftrusty%2Fpython-eventlet.git

diff --git a/debian/patches/use-packaged-python-mock-rather-than-embedded.patch b/debian/patches/use-packaged-python-mock-rather-than-embedded.patch
index 2bbc301..12a3bad 100644
--- a/debian/patches/use-packaged-python-mock-rather-than-embedded.patch
+++ b/debian/patches/use-packaged-python-mock-rather-than-embedded.patch
@@ -2,29 +2,28 @@ Description: Use the packaged python-mock package
  Upstream is "vendorizing" mock. This sux...
 Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
-Last-Update: 2014-09-07
+Last-Update: 2015-02-08
 
 --- a/tests/db_pool_test.py
 +++ b/tests/db_pool_test.py
-@@ -7,7 +7,8 @@ import os
+@@ -7,7 +7,8 @@
  import traceback
  from unittest import TestCase, main
  
--from tests import mock, skipped, skip_unless, skip_with_pyevent, get_database_auth
+-from tests import mock, skip_unless, skip_with_pyevent, get_database_auth
 +import mock
-+from tests import skipped, skip_unless, skip_with_pyevent, get_database_auth
++from tests import skip_unless, skip_with_pyevent, get_database_auth
  from eventlet import event
  from eventlet import db_pool
  from eventlet.support import six
 --- a/tests/websocket_test.py
 +++ b/tests/websocket_test.py
-@@ -8,7 +8,8 @@ from eventlet.green import httplib
- from eventlet.support import six
+@@ -9,7 +9,7 @@
  from eventlet.websocket import WebSocket, WebSocketWSGI
  
--from tests import certificate_file, LimitedTestCase, mock, private_key_file
+ import tests
+-from tests import mock
 +import mock
-+from tests import certificate_file, LimitedTestCase, private_key_file
- from tests import skip_if_no_ssl
- from tests.wsgi_test import _TestBase
+ import tests.wsgi_test
+