Code Review
/
packages
/
trusty
/
python-eventlet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add python-eventlet package to MOS 9.0 repository
[packages/trusty/python-eventlet.git]
/
debian
/
patches
/
use-packaged-python-mock-rather-than-embedded.patch
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 41654e8d56fda0dfc4f7b1e9e6d0e6f988a58202..12a3bad092e967c08bfc128ce115018d81028c6f 100644
(file)
--- a/
debian/patches/use-packaged-python-mock-rather-than-embedded.patch
+++ b/
debian/patches/use-packaged-python-mock-rather-than-embedded.patch
@@
-4,27
+4,26
@@
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2015-02-08
Forwarded: no
Last-Update: 2015-02-08
----
python-eventlet-0.16.1.orig
/tests/db_pool_test.py
-+++
python-eventlet-0.16.1
/tests/db_pool_test.py
-@@ -7,7 +7,8 @@
import os
+---
a
/tests/db_pool_test.py
++++
b
/tests/db_pool_test.py
+@@ -7,7 +7,8 @@
import traceback
from unittest import TestCase, main
import traceback
from unittest import TestCase, main
--from tests import mock, skip
ped, skip
_unless, skip_with_pyevent, get_database_auth
+-from tests import mock, skip_unless, skip_with_pyevent, get_database_auth
+import mock
+import mock
-+from tests import skip
ped, 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
from eventlet import event
from eventlet import db_pool
from eventlet.support import six
---- python-eventlet-0.16.1.orig/tests/websocket_test.py
-+++ python-eventlet-0.16.1/tests/websocket_test.py
-@@ -8,7 +8,8 @@ from eventlet.green import httplib
- from eventlet.support import six
+--- a/tests/websocket_test.py
++++ b/tests/websocket_test.py
+@@ -9,7 +9,7 @@
from eventlet.websocket import WebSocket, WebSocketWSGI
from eventlet.websocket import WebSocket, WebSocketWSGI
--from tests import certificate_file, LimitedTestCase, mock, private_key_file
+ import tests
+-from tests import mock
+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
+